From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 28 Mar 2008 10:57:55 +0000 (+0100)
Subject: x86: mpparse, move disabled cpus to smpboot.c, fix
X-Git-Tag: v2.6.26-rc1~1154^2~93
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=059c9640b57cb8e70c60de141ec817b450431816;p=linux-2.6

x86: mpparse, move disabled cpus to smpboot.c, fix

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 bf29dcc37d..0f877a572c 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -196,7 +196,9 @@ 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;
 	}
 
@@ -901,7 +903,9 @@ void __cpuinit mp_register_lapic (u8 id, u8 enabled)
 	}
 
 	if (!enabled) {
+#ifdef CONFIG_X86_SMP
 		++disabled_cpus;
+#endif
 		return;
 	}