From 2e94dcd0e764a39bb69d5a29b0ac92407c290f0c Mon Sep 17 00:00:00 2001
From: Alexey Starikovskiy <astarikovskiy@suse.de>
Date: Thu, 27 Mar 2008 23:54:50 +0300
Subject: [PATCH] --- yaml --- r: 89087 b: refs/heads/master c:
 2bb9e9d7c1b03454665cd99f7d73e67139cdf2e6 h: refs/heads/master i:   89085:
 2c08252d475df0478cc5f4162659ef42108d3e25   89083:
 12f78b4eaf93c17e5cf869ba875343c4bb266145   89079:
 cec7d6406376c0c0fded4fd1e08d9e8b7dde38e1   89071:
 f045da0daf5611d7ce461194df6a62cc372ee974   89055:
 3dc06a14a120800ca38e4027f11c24421d2434dc   89023:
 eb7ec47aa0ef1d142b117fdf95ddb4eba8e8e9fa   88959:
 cc0c7402f10a145b987479f5731aabfa11f79791   88831:
 1c4cf3aaafa5540de766ecfe9e82666a5a9568f9   88575:
 31b55bb28847f0b8de9f1d58e93870aa107f8db4   88063:
 6c3bac09bdab7d7df7970dac181ffd519b6b0c38 v: v3

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

diff --git a/[refs] b/[refs]
index de686ce5dd97..992d03156e99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40014bace17ba393409fd8a4915a87e43687aac8
+refs/heads/master: 2bb9e9d7c1b03454665cd99f7d73e67139cdf2e6
diff --git a/trunk/arch/x86/kernel/mpparse_32.c b/trunk/arch/x86/kernel/mpparse_32.c
index f7eceabc7da9..4d810b0384a5 100644
--- a/trunk/arch/x86/kernel/mpparse_32.c
+++ b/trunk/arch/x86/kernel/mpparse_32.c
@@ -65,8 +65,11 @@ unsigned int def_to_bigsmp = 0;
 
 /* Processor that is doing the boot up */
 unsigned int boot_cpu_physical_apicid = -1U;
-/* Internal processor count */
+
+/* Make it easy to share the UP and SMP code: */
+#ifndef CONFIG_X86_SMP
 unsigned int num_processors;
+#endif
 
 unsigned disabled_cpus __cpuinitdata;
 
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
index 8b6eefd9e906..e1288c2626f8 100644
--- a/trunk/arch/x86/kernel/smpboot.c
+++ b/trunk/arch/x86/kernel/smpboot.c
@@ -86,6 +86,9 @@ 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);
 
+/* Internal processor count */
+unsigned int num_processors;
+
 /* Bitmask of physically existing CPUs */
 physid_mask_t phys_cpu_present_map;