From 7b8cbd2c2f1bf9e3090d3c3fc09330ed1ca28d25 Mon Sep 17 00:00:00 2001
From: Alexey Starikovskiy <astarikovskiy@suse.de>
Date: Thu, 27 Mar 2008 23:55:59 +0300
Subject: [PATCH] x86: move num_processors to smpboot.c (64 bit)
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/mpparse_64.c | 3 ---
arch/x86/kernel/smpboot.c | 5 +++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index 8e8e38f2b18..71f098414d0 100644
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -60,9 +60,6 @@ int nr_ioapics;
unsigned int boot_cpu_physical_apicid = -1U;
EXPORT_SYMBOL(boot_cpu_physical_apicid);
-/* Internal processor count */
-unsigned int num_processors;
-
unsigned disabled_cpus __cpuinitdata;
#ifdef CONFIG_SMP
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index eee7768de2a..fd0bdd36f4e 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -84,13 +84,14 @@ u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
= { [0 ... NR_CPUS-1] = BAD_APICID };
void *x86_bios_cpu_apicid_early_ptr;
-/* Internal processor count */
-unsigned int num_processors;
unsigned disabled_cpus __cpuinitdata;
u8 apicid_2_node[MAX_APICID];
#endif
+/* Internal processor count */
+unsigned int num_processors;
+
/* Bitmask of physically existing CPUs */
physid_mask_t phys_cpu_present_map;
--
2.41.3