aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-03-19 13:25:53 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:41:02 -0400
commitf6bc40290964b5fcb48c226ccafa4b7536d62663 (patch)
tree4b59929aaef9fa73a909b1700726074ef98a134e /arch/x86/kernel
parent4370ee4d3b7772158174bf6f0bf08359c2ccf54b (diff)
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')
-rw-r--r--arch/x86/kernel/acpi/boot.c4
-rw-r--r--arch/x86/kernel/mpparse_64.c2
-rw-r--r--arch/x86/kernel/smpboot.c2
-rw-r--r--arch/x86/kernel/smpboot_64.c1
4 files changed, 9 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 @@
40#include <asm/io.h> 40#include <asm/io.h>
41#include <asm/mpspec.h> 41#include <asm/mpspec.h>
42 42
43#ifdef CONFIG_X86_LOCAL_APIC
44# include <mach_apic.h>
45#endif
46
43static int __initdata acpi_force = 0; 47static int __initdata acpi_force = 0;
44 48
45#ifdef CONFIG_ACPI 49#ifdef CONFIG_ACPI
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index 529b1c22077e..03ef1a8b53e8 100644
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -30,6 +30,8 @@
30#include <asm/proto.h> 30#include <asm/proto.h>
31#include <asm/acpi.h> 31#include <asm/acpi.h>
32 32
33#include <mach_apic.h>
34
33/* Have we found an MP table */ 35/* Have we found an MP table */
34int smp_found_config; 36int smp_found_config;
35unsigned int __cpuinitdata maxcpus = NR_CPUS; 37unsigned int __cpuinitdata maxcpus = NR_CPUS;
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 6978f1bf6533..253be86a88e4 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -11,6 +11,8 @@
11#include <asm/cpu.h> 11#include <asm/cpu.h>
12#include <asm/numa.h> 12#include <asm/numa.h>
13 13
14#include <mach_apic.h>
15
14/* Number of siblings per CPU package */ 16/* Number of siblings per CPU package */
15int smp_num_siblings = 1; 17int smp_num_siblings = 1;
16EXPORT_SYMBOL(smp_num_siblings); 18EXPORT_SYMBOL(smp_num_siblings);
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index 7d1b4cb380db..8a59fa80f883 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -61,6 +61,7 @@
61#include <asm/numa.h> 61#include <asm/numa.h>
62 62
63#include <mach_wakecpu.h> 63#include <mach_wakecpu.h>
64#include <mach_apic.h>
64#include <smpboot_hooks.h> 65#include <smpboot_hooks.h>
65 66
66/* Set when the idlers are all forked */ 67/* Set when the idlers are all forked */