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 bf29dcc37de718dd6997dfdc765b2155392ccaa7..0f877a572cf062df4de8ffab76ea7a7dbed4a888 100644 (file)
--- 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;
        }