---

yaml --- r: 89087 b: refs/heads/master c: 2bb9e9d h: refs/heads/master i: 89085: 2c08252 89083: 12f78b4 89079: cec7d64 89071: f045da0 89055: 3dc06a1 89023: eb7ec47 88959: cc0c740 88831: 1c4cf3a 88575: 31b55bb 88063: 6c3bac0 v: v3
git-mirror · Apr 17, 2008 · 2e94dcd · 2e94dcd
1 parent 44e6977
commit 2e94dcd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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;