diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-03-28 06:57:55 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:31 -0400 |
commit | 059c9640b57cb8e70c60de141ec817b450431816 (patch) | |
tree | 029694b4df21d4e4082e62502796932d91fd57b6 | |
parent | 53c4c793b30bbf6e1a25cab61790b18f205dd365 (diff) |
x86: mpparse, move disabled cpus to smpboot.c, fix
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/kernel/mpparse_32.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c index bf29dcc37de7..0f877a572cf0 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) | |||
196 | int apicid; | 196 | int apicid; |
197 | 197 | ||
198 | if (!(m->mpc_cpuflag & CPU_ENABLED)) { | 198 | if (!(m->mpc_cpuflag & CPU_ENABLED)) { |
199 | #ifdef CONFIG_X86_SMP | ||
199 | disabled_cpus++; | 200 | disabled_cpus++; |
201 | #endif | ||
200 | return; | 202 | return; |
201 | } | 203 | } |
202 | 204 | ||
@@ -901,7 +903,9 @@ void __cpuinit mp_register_lapic (u8 id, u8 enabled) | |||
901 | } | 903 | } |
902 | 904 | ||
903 | if (!enabled) { | 905 | if (!enabled) { |
906 | #ifdef CONFIG_X86_SMP | ||
904 | ++disabled_cpus; | 907 | ++disabled_cpus; |
908 | #endif | ||
905 | return; | 909 | return; |
906 | } | 910 | } |
907 | 911 | ||