summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/acpi
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-03-19 14:25:53 -0300
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:41:02 +0200
commitf6bc40290964b5fcb48c226ccafa4b7536d62663 (patch)
tree4b59929aaef9fa73a909b1700726074ef98a134e /arch/x86/kernel/acpi
parent4370ee4d3b7772158174bf6f0bf08359c2ccf54b (diff)
downloadlinux-f6bc40290964b5fcb48c226ccafa4b7536d62663.tar.gz
linux-f6bc40290964b5fcb48c226ccafa4b7536d62663.tar.bz2
linux-f6bc40290964b5fcb48c226ccafa4b7536d62663.zip
x86: include mach_apic.h in smpboot_64.c and smpboot.c
After the inclusion, a lot of files needs fixing for conflicts, some of them in the headers themselves, to accomodate for both i386 and x86_64 versions. [ mingo@elte.hu: build fix ] Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/acpi')
-rw-r--r--arch/x86/kernel/acpi/boot.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 2cdc9de9371d..956b60f3ebd5 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -40,6 +40,10 @@
#include <asm/io.h>
#include <asm/mpspec.h>
+#ifdef CONFIG_X86_LOCAL_APIC
+# include <mach_apic.h>
+#endif
+
static int __initdata acpi_force = 0;
#ifdef CONFIG_ACPI