commit 40014bace17ba393409fd8a4915a87e43687aac8
author Alexey Starikovskiy <astarikovskiy@suse.de> Thu Mar 27 23:54:44 2008 +0300
committer Ingo Molnar <mingo@elte.hu> Thu Apr 17 17:41:31 2008 +0200
tree 63a22b5f1997d15bb1ef67b30fe2e869ae5dcc11
parent 8f6e2ca9f862cb3738ad83fb18c572d8a59c0849

x86: move phys_cpu_present_map to smpboot.c

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/kernel/mpparse_32.c

diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 728aa99..f7eceab 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -70,8 +70,10 @@
 
 unsigned disabled_cpus __cpuinitdata;
 
-/* Bitmask of physically existing CPUs */
+/* Make it easy to share the UP and SMP code: */
+#ifndef CONFIG_X86_SMP
 physid_mask_t phys_cpu_present_map;
+#endif
 
 #ifndef CONFIG_SMP
 DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID;

arch/x86/kernel/smpboot.c

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 61b9a5b..8b6eefd 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -85,6 +85,10 @@
 void *x86_bios_cpu_apicid_early_ptr;
 DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID;
 EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid);
+
+/* Bitmask of physically existing CPUs */
+physid_mask_t phys_cpu_present_map;
+
 u8 apicid_2_node[MAX_APICID];
 #endif