summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-03-27 23:55:53 +0300
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:41:32 +0200
commit1d8554326533568c7e9d5285600c3d0c027b45cc (patch)
treef3f035b2141a227fb1680dff8735e12922155819
parent7abb3cca33fe220abaf680afcd247370749622ee (diff)
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>
-rw-r--r--arch/x86/kernel/mpparse_64.c3
-rw-r--r--arch/x86/kernel/smpboot.c6
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index f044e98800ef..8e8e38f2b182 100644
--- 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 7bcee1584b50..eee7768de2ae 100644
--- 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 };