x86: move phys_cpu_present_map to setup.c

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

diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 7b7e008496e0567bc23a3cce26753b9b6fecfca8..4f4cfad9ae5737f5eefe4565a220edbdb6845a90 100644 (file)
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -69,11 +69,6 @@ unsigned int boot_cpu_physical_apicid = -1U;
 #endif
 #endif
 
-/* Make it easy to share the UP and SMP code: */
-#ifndef CONFIG_X86_SMP
-physid_mask_t phys_cpu_present_map;
-#endif
-
 /*
  * Intel MP BIOS table parsing routines:
  */

diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index 378c4ba80b479650b26ae0fc4105536f019d2920..8d7365511ac0ba3b09b9ce700c5dfcd629cdc4d8 100644 (file)
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -70,11 +70,6 @@ unsigned int boot_cpu_physical_apicid = -1U;
 #endif
 #endif
 
-/* Make it easy to share the UP and SMP code: */
-#ifndef CONFIG_X86_SMP
-physid_mask_t phys_cpu_present_map;
-#endif
-
 /*
  * Intel MP BIOS table parsing routines:
  */

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 01119d9b013e903c4fc79dce59b7395208810b57..011fcdd213ff8ea2c89bb46160baf5b8e781c632 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -9,11 +9,15 @@
 #include <asm/processor.h>
 #include <asm/setup.h>
 #include <asm/topology.h>
+#include <asm/mpspec.h>
 #include <asm/apicdef.h>
 
 DEFINE_PER_CPU(u16, x86_cpu_to_apicid) = BAD_APICID;
 EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid);
 
+/* Bitmask of physically existing CPUs */
+physid_mask_t phys_cpu_present_map;
+
 #if defined(CONFIG_HAVE_SETUP_PER_CPU_AREA) && defined(CONFIG_SMP)
 /*
  * Copy data used in early init routines from the initial arrays to the

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 412061a0bf2b661754aca44cd97e58f9afedf728..7e6aa1c790a2e6954122b782438ca5229650d8fe 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -88,9 +88,6 @@ u8 apicid_2_node[MAX_APICID];
 /* Internal processor count */
 unsigned int num_processors;
 
-/* Bitmask of physically existing CPUs */
-physid_mask_t phys_cpu_present_map;
-
 /* State of each CPU */
 DEFINE_PER_CPU(int, cpu_state) = { 0 };