From 44e697768d4818722c6d3d12befd6375dd66486a Mon Sep 17 00:00:00 2001
From: Alexey Starikovskiy <astarikovskiy@suse.de>
Date: Thu, 27 Mar 2008 23:54:44 +0300
Subject: [PATCH] --- yaml --- r: 89086 b: refs/heads/master c:
 40014bace17ba393409fd8a4915a87e43687aac8 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/mpparse_32.c | 4 +++-
 trunk/arch/x86/kernel/smpboot.c    | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1375abc11427..de686ce5dd97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f6e2ca9f862cb3738ad83fb18c572d8a59c0849
+refs/heads/master: 40014bace17ba393409fd8a4915a87e43687aac8
diff --git a/trunk/arch/x86/kernel/mpparse_32.c b/trunk/arch/x86/kernel/mpparse_32.c
index 728aa9900934..f7eceabc7da9 100644
--- a/trunk/arch/x86/kernel/mpparse_32.c
+++ b/trunk/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/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
index 61b9a5b6fc07..8b6eefd9e906 100644
--- a/trunk/arch/x86/kernel/smpboot.c
+++ b/trunk/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