]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86: mpparse, move disabled cpus to smpboot.c, fix
authorIngo Molnar <mingo@elte.hu>
Fri, 28 Mar 2008 10:57:55 +0000 (11:57 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Apr 2008 15:41:31 +0000 (17:41 +0200)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/mpparse_32.c

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