x86: move num_processors to smpboot.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index f7eceab..4d810b0 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -65,8 +65,11 @@
/* 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/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 8b6eefd..e1288c2 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -86,6 +86,9 @@
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;