summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-03-27 20:54:50 (GMT)
committerIngo Molnar <mingo@elte.hu>2008-04-17 15:41:31 (GMT)
commit2bb9e9d7c1b03454665cd99f7d73e67139cdf2e6 (patch)
treec5164abb42ab3f5ab671402caf05bec9fa225233 /arch/x86
parent40014bace17ba393409fd8a4915a87e43687aac8 (diff)
downloadlinux-fsl-qoriq-2bb9e9d7c1b03454665cd99f7d73e67139cdf2e6.tar.xz
x86: move num_processors to smpboot.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/mpparse_32.c5
-rw-r--r--arch/x86/kernel/smpboot.c3
2 files changed, 7 insertions, 1 deletions
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 @@ 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/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 @@ 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;