summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/mpparse_32.c
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-04-04 19:41:44 (GMT)
committerIngo Molnar <mingo@elte.hu>2008-04-17 15:41:35 (GMT)
commit2fe60147570231cde0d1f14711d2e34ccdf54b65 (patch)
tree83c1e87d9ce3475b68c97f51f95be0467c83a61d /arch/x86/kernel/mpparse_32.c
parent350bae1d3f0d0c763c5bb9cc5fb5c363bd0086db (diff)
downloadlinux-fsl-qoriq-2fe60147570231cde0d1f14711d2e34ccdf54b65.tar.xz
x86: move up & smp variables to setup.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/mpparse_32.c')
-rw-r--r--arch/x86/kernel/mpparse_32.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 2b16e5c..ed4b3bc 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -49,15 +49,6 @@ static int mp_current_pci_id;
int pic_mode;
-/* Make it easy to share the UP and SMP code: */
-#ifndef CONFIG_X86_SMP
-unsigned int num_processors;
-unsigned disabled_cpus __cpuinitdata;
-#ifndef CONFIG_X86_LOCAL_APIC
-unsigned int boot_cpu_physical_apicid = -1U;
-#endif
-#endif
-
/*
* Intel MP BIOS table parsing routines:
*/
@@ -93,9 +84,7 @@ static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
int apicid;
if (!(m->mpc_cpuflag & CPU_ENABLED)) {
-#ifdef CONFIG_X86_SMP
disabled_cpus++;
-#endif
return;
}
@@ -817,9 +806,7 @@ void __cpuinit mp_register_lapic (int id, u8 enabled)
}
if (!enabled) {
-#ifdef CONFIG_X86_SMP
++disabled_cpus;
-#endif
return;
}