p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

x86/apic: Always define nox2apic and define it as initdata 

The "nox2apic" variable can be defined as __initdata since it is
only used for bootstrap.  It can now unconditionally be defined
since it will later be freed.

At the same time, it is also better off as a bool.

Signed-off-by: David Rientjes <rientjes@google.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1402042354380.7839@chino.kir.corp.google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
David Rientjes 2014-02-04 23:55:06 -08:00 committed by Ingo Molnar
parent 6d4989835e
commit dc9788f40a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/apic.h
View File

@ -217,7 +217,6 @@ static inline void x2apic_force_phys(void)
{ {
} }
#define nox2apic 0
#define x2apic_preenabled 0 #define x2apic_preenabled 0
#define x2apic_supported() 0 #define x2apic_supported() 0
#endif #endif

9
arch/x86/kernel/apic/apic.c
View File

@ -133,6 +133,10 @@ static inline void imcr_apic_to_pic(void)
* +1=force-enable * +1=force-enable
*/ */
static int force_enable_local_apic __initdata; static int force_enable_local_apic __initdata;
/* Control whether x2APIC mode is enabled or not */
static bool nox2apic __initdata;
/* /*
* APIC command line parameters * APIC command line parameters
*/ */
@ -162,8 +166,7 @@ int x2apic_mode;
/* x2apic enabled before OS handover */ /* x2apic enabled before OS handover */
int x2apic_preenabled; int x2apic_preenabled;
static int x2apic_disabled; static int x2apic_disabled;
static int nox2apic; static int __init setup_nox2apic(char *str)
static __init int setup_nox2apic(char *str)
{ {
if (x2apic_enabled()) { if (x2apic_enabled()) {
int apicid = native_apic_msr_read(APIC_ID); int apicid = native_apic_msr_read(APIC_ID);
@ -178,7 +181,7 @@ static __init int setup_nox2apic(char *str)
} else } else
setup_clear_cpu_cap(X86_FEATURE_X2APIC); setup_clear_cpu_cap(X86_FEATURE_X2APIC);
nox2apic = 1; nox2apic = true;
return 0; return 0;
} }