aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/mpparse_32.c4
-rw-r--r--arch/x86/kernel/smpboot.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 728aa990093..f7eceabc7da 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -70,8 +70,10 @@ unsigned int num_processors;
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;
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 61b9a5b6fc0..8b6eefd9e90 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -85,6 +85,10 @@ u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
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