aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-04-04 23:40:48 +0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:41:34 +0200
commit0fc0906e59df1427d194b78376d15ca48079f6bf (patch)
treeb76f509e9028d7afd775d7e64fd6fbcfb733b068 /arch/x86
parent76eb41319d6ab98d17c81a8001a6d7ed9f8359ee (diff)
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/mpparse_32.c5
-rw-r--r--arch/x86/kernel/mpparse_64.c5
-rw-r--r--arch/x86/kernel/setup.c4
-rw-r--r--arch/x86/kernel/smpboot.c3
4 files changed, 4 insertions, 13 deletions
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 7b7e008496e..4f4cfad9ae5 100644
--- 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 378c4ba80b4..8d7365511ac 100644
--- 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 01119d9b013..011fcdd213f 100644
--- 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 412061a0bf2..7e6aa1c790a 100644
--- 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 };