diff options
| author | David Rientjes <rientjes@google.com> | 2014-02-04 23:55:06 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-09 15:15:11 +0100 |
| commit | dc9788f40a769d967de3eb5a7aee8c1a70094d32 (patch) | |
| tree | 3ac3cbc1a35f7ea668b812818a472f4cec72850e /arch/x86/kernel/apic | |
| parent | 6d4989835e5418fdfda764fce7294246f80cf464 (diff) | |
| download | linux-dc9788f40a769d967de3eb5a7aee8c1a70094d32.tar.gz linux-dc9788f40a769d967de3eb5a7aee8c1a70094d32.tar.bz2 linux-dc9788f40a769d967de3eb5a7aee8c1a70094d32.zip | |
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>
Diffstat (limited to 'arch/x86/kernel/apic')
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 7f26c9a70a9e..f824d697db19 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -133,6 +133,10 @@ static inline void imcr_apic_to_pic(void) * +1=force-enable */ static int force_enable_local_apic __initdata; + +/* Control whether x2APIC mode is enabled or not */ +static bool nox2apic __initdata; + /* * APIC command line parameters */ @@ -162,8 +166,7 @@ int x2apic_mode; /* x2apic enabled before OS handover */ int x2apic_preenabled; static int x2apic_disabled; -static int nox2apic; -static __init int setup_nox2apic(char *str) +static int __init setup_nox2apic(char *str) { if (x2apic_enabled()) { int apicid = native_apic_msr_read(APIC_ID); @@ -178,7 +181,7 @@ static __init int setup_nox2apic(char *str) } else setup_clear_cpu_cap(X86_FEATURE_X2APIC); - nox2apic = 1; + nox2apic = true; return 0; } |