Эх сурвалжийг харах

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

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Ingo Molnar 17 жил өмнө
parent
commit
059c9640b5

+ 4 - 0
arch/x86/kernel/mpparse_32.c

@@ -196,7 +196,9 @@ static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
 	int apicid;
 	int apicid;
 
 
 	if (!(m->mpc_cpuflag & CPU_ENABLED)) {
 	if (!(m->mpc_cpuflag & CPU_ENABLED)) {
+#ifdef CONFIG_X86_SMP
 		disabled_cpus++;
 		disabled_cpus++;
+#endif
 		return;
 		return;
 	}
 	}
 
 
@@ -901,7 +903,9 @@ void __cpuinit mp_register_lapic (u8 id, u8 enabled)
 	}
 	}
 
 
 	if (!enabled) {
 	if (!enabled) {
+#ifdef CONFIG_X86_SMP
 		++disabled_cpus;
 		++disabled_cpus;
+#endif
 		return;
 		return;
 	}
 	}