commit 16ecf7a47cf4f1c97189a551b001195aed550cc2
author Alexey Starikovskiy <astarikovskiy@suse.de> Fri Apr 04 23:41:00 2008 +0400
committer Ingo Molnar <mingo@elte.hu> Thu Apr 17 17:41:34 2008 +0200
tree 13200515b708be08672c9ac9c5cc0b09b1ed486e
parent 708650afe98a50d0b280bea9dcf5f160b94ee9fb

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>

arch/x86/kernel/mpparse_64.c

diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index 8d73655..3196c23 100644
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -55,12 +55,6 @@
 
 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;

arch/x86/kernel/smpboot.c

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index e3ea074..abf6376 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -78,11 +78,11 @@
 			{ [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