diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-03-21 13:18:17 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:21 -0400 |
commit | 89bda4fccbd49f4b2bf59d0165391696037be856 (patch) | |
tree | 2c1cabaa7c6636fce62b9ddd0127c850c313e078 | |
parent | fa3f1f42b4efac84c459383218c20ab39e4df566 (diff) |
x86: use same index for processor maps
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/kernel/mpparse_32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c index 15265ee11f89..1b225cea5d7b 100644 --- a/arch/x86/kernel/mpparse_32.c +++ b/arch/x86/kernel/mpparse_32.c | |||
@@ -212,7 +212,6 @@ static void __cpuinit MP_processor_info (struct mpc_config_processor *m) | |||
212 | return; | 212 | return; |
213 | } | 213 | } |
214 | 214 | ||
215 | cpu_set(num_processors, cpu_possible_map); | ||
216 | num_processors++; | 215 | num_processors++; |
217 | cpus_complement(tmp_map, cpu_present_map); | 216 | cpus_complement(tmp_map, cpu_present_map); |
218 | cpu = first_cpu(tmp_map); | 217 | cpu = first_cpu(tmp_map); |
@@ -251,12 +250,13 @@ static void __cpuinit MP_processor_info (struct mpc_config_processor *m) | |||
251 | u16 *bios_cpu_apicid = x86_bios_cpu_apicid_early_ptr; | 250 | u16 *bios_cpu_apicid = x86_bios_cpu_apicid_early_ptr; |
252 | 251 | ||
253 | cpu_to_apicid[cpu] = m->mpc_apicid; | 252 | cpu_to_apicid[cpu] = m->mpc_apicid; |
254 | bios_cpu_apicid[num_processors - 1] = m->mpc_apicid; | 253 | bios_cpu_apicid[cpu] = m->mpc_apicid; |
255 | } else { | 254 | } else { |
256 | per_cpu(x86_cpu_to_apicid, cpu) = m->mpc_apicid; | 255 | per_cpu(x86_cpu_to_apicid, cpu) = m->mpc_apicid; |
257 | per_cpu(x86_bios_cpu_apicid, cpu) = m->mpc_apicid; | 256 | per_cpu(x86_bios_cpu_apicid, cpu) = m->mpc_apicid; |
258 | } | 257 | } |
259 | #endif | 258 | #endif |
259 | cpu_set(cpu, cpu_possible_map); | ||
260 | cpu_set(cpu, cpu_present_map); | 260 | cpu_set(cpu, cpu_present_map); |
261 | } | 261 | } |
262 | 262 | ||