aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-03-27 16:54:57 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:41:31 -0400
commit53c4c793b30bbf6e1a25cab61790b18f205dd365 (patch)
treed54ad93cdd45281864072daca01b964ed64eb329 /arch
parent2bb9e9d7c1b03454665cd99f7d73e67139cdf2e6 (diff)
x86: move disabled_cpus to smpboot.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/mpparse_32.c3
-rw-r--r--arch/x86/kernel/smpboot.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 4d810b0384a5..bf29dcc37de7 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -69,9 +69,8 @@ unsigned int boot_cpu_physical_apicid = -1U;
69/* Make it easy to share the UP and SMP code: */ 69/* Make it easy to share the UP and SMP code: */
70#ifndef CONFIG_X86_SMP 70#ifndef CONFIG_X86_SMP
71unsigned int num_processors; 71unsigned int num_processors;
72#endif
73
74unsigned disabled_cpus __cpuinitdata; 72unsigned disabled_cpus __cpuinitdata;
73#endif
75 74
76/* Make it easy to share the UP and SMP code: */ 75/* Make it easy to share the UP and SMP code: */
77#ifndef CONFIG_X86_SMP 76#ifndef CONFIG_X86_SMP
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index e1288c2626f8..d3402e2c57eb 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -88,6 +88,7 @@ EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid);
88 88
89/* Internal processor count */ 89/* Internal processor count */
90unsigned int num_processors; 90unsigned int num_processors;
91unsigned disabled_cpus __cpuinitdata;
91 92
92/* Bitmask of physically existing CPUs */ 93/* Bitmask of physically existing CPUs */
93physid_mask_t phys_cpu_present_map; 94physid_mask_t phys_cpu_present_map;