aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-04-04 23:41:00 +0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:41:34 +0200
commit16ecf7a47cf4f1c97189a551b001195aed550cc2 (patch)
tree13200515b708be08672c9ac9c5cc0b09b1ed486e
parent708650afe98a50d0b280bea9dcf5f160b94ee9fb (diff)
x86: move x86_bios_cpu_apicid_init to smpboot.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/mpparse_64.c6
-rw-r--r--arch/x86/kernel/smpboot.c2
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index 8d7365511ac..3196c231864 100644
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -55,12 +55,6 @@ int mp_irq_entries;
int nr_ioapics;
-#ifdef CONFIG_SMP
-u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
- = {[0 ... NR_CPUS - 1] = BAD_APICID };
-void *x86_bios_cpu_apicid_early_ptr;
-#endif
-
/* Make it easy to share the UP and SMP code: */
#ifndef CONFIG_X86_SMP
unsigned int num_processors;
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index e3ea074ba6a..abf63767cd4 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -78,11 +78,11 @@ u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata =
{ [0 ... NR_CPUS-1] = BAD_APICID };
void *x86_cpu_to_apicid_early_ptr;
-#ifdef CONFIG_X86_32
u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
= { [0 ... NR_CPUS-1] = BAD_APICID };
void *x86_bios_cpu_apicid_early_ptr;
+#ifdef CONFIG_X86_32
u8 apicid_2_node[MAX_APICID];
#endif