diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-20 19:11:20 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 06:48:31 -0400 |
commit | 3c999f142665265afd0fe9190204dd051f17e505 (patch) | |
tree | 83b764c2a90890c22b199d6445cf2e132babe455 /arch/x86/kernel/apic_32.c | |
parent | 88a6846c70ad6bf33a545d554ace801d69e8a1a5 (diff) |
x86: check command line when CONFIG_X86_MPPARSE is not set, v2
if acpi=off, acpi=noirq and pci=noacpi, we need to disable apic.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: "Maciej W. Rozycki" <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic_32.c')
-rw-r--r-- | arch/x86/kernel/apic_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index dd8de26b2786..4932d7813bcd 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c | |||
@@ -57,7 +57,7 @@ unsigned long mp_lapic_addr; | |||
57 | * | 57 | * |
58 | * -1=force-disable, +1=force-enable | 58 | * -1=force-disable, +1=force-enable |
59 | */ | 59 | */ |
60 | static int enable_local_apic __initdata; | 60 | int enable_local_apic; |
61 | 61 | ||
62 | /* Local APIC timer verification ok */ | 62 | /* Local APIC timer verification ok */ |
63 | static int local_apic_timer_verify_ok; | 63 | static int local_apic_timer_verify_ok; |