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 /include/asm-x86/apic.h | |
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 'include/asm-x86/apic.h')
-rw-r--r-- | include/asm-x86/apic.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h index 313bcaf4b6c..9fe941cd843 100644 --- a/include/asm-x86/apic.h +++ b/include/asm-x86/apic.h | |||
@@ -39,8 +39,12 @@ extern int apic_verbosity; | |||
39 | extern int local_apic_timer_c2_ok; | 39 | extern int local_apic_timer_c2_ok; |
40 | 40 | ||
41 | extern int ioapic_force; | 41 | extern int ioapic_force; |
42 | extern int disable_apic; | ||
43 | 42 | ||
43 | #ifdef CONFIG_X86_64 | ||
44 | extern int disable_apic; | ||
45 | #else | ||
46 | extern int enable_local_apic; | ||
47 | #endif | ||
44 | /* | 48 | /* |
45 | * Basic functions accessing APICs. | 49 | * Basic functions accessing APICs. |
46 | */ | 50 | */ |