x86: move phys_cpu_present_map to smpboot.c (64bit)

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

diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index f044e98800ef2803dfbdc2fb939db7a74e270fb2..8e8e38f2b182f08489cfab0e45c0e990187a5515 100644 (file)
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -65,9 +65,6 @@ unsigned int num_processors;
 
 unsigned disabled_cpus __cpuinitdata;
 
-/* Bitmask of physically existing CPUs */
-physid_mask_t phys_cpu_present_map = PHYSID_MASK_NONE;
-
 #ifdef CONFIG_SMP
 u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
     = {[0 ... NR_CPUS - 1] = BAD_APICID };

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 7bcee1584b50d22dc1495e098b775faea242729d..eee7768de2ae54a041c7c26d0460f2d592278144 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -88,12 +88,12 @@ void *x86_bios_cpu_apicid_early_ptr;
 unsigned int num_processors;
 unsigned disabled_cpus __cpuinitdata;
 
-/* Bitmask of physically existing CPUs */
-physid_mask_t phys_cpu_present_map;
-
 u8 apicid_2_node[MAX_APICID];
 #endif
 
+/* Bitmask of physically existing CPUs */
+physid_mask_t phys_cpu_present_map;
+
 /* State of each CPU */
 DEFINE_PER_CPU(int, cpu_state) = { 0 };