summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/apic.h
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-21 01:11:20 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-08 12:48:31 +0200
commit3c999f142665265afd0fe9190204dd051f17e505 (patch)
tree83b764c2a90890c22b199d6445cf2e132babe455 /include/asm-x86/apic.h
parentxen: set max_pfn_mapped (diff)
downloadlinux-3c999f142665265afd0fe9190204dd051f17e505.tar.xz
linux-3c999f142665265afd0fe9190204dd051f17e505.zip
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.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h
index 313bcaf4b6c3..9fe941cd843d 100644
--- a/include/asm-x86/apic.h
+++ b/include/asm-x86/apic.h
@@ -39,8 +39,12 @@ extern int apic_verbosity;
extern int local_apic_timer_c2_ok;
extern int ioapic_force;
-extern int disable_apic;
+#ifdef CONFIG_X86_64
+extern int disable_apic;
+#else
+extern int enable_local_apic;
+#endif
/*
* Basic functions accessing APICs.
*/