|
@@ -581,14 +581,14 @@ smp_build_cpu_map (void)
|
|
|
|
|
|
ia64_cpu_to_sapicid[0] = boot_cpu_id;
|
|
ia64_cpu_to_sapicid[0] = boot_cpu_id;
|
|
cpus_clear(cpu_present_map);
|
|
cpus_clear(cpu_present_map);
|
|
- cpu_set(0, cpu_present_map);
|
|
|
|
- cpu_set(0, cpu_possible_map);
|
|
|
|
|
|
+ set_cpu_present(0, true);
|
|
|
|
+ set_cpu_possible(0, true);
|
|
for (cpu = 1, i = 0; i < smp_boot_data.cpu_count; i++) {
|
|
for (cpu = 1, i = 0; i < smp_boot_data.cpu_count; i++) {
|
|
sapicid = smp_boot_data.cpu_phys_id[i];
|
|
sapicid = smp_boot_data.cpu_phys_id[i];
|
|
if (sapicid == boot_cpu_id)
|
|
if (sapicid == boot_cpu_id)
|
|
continue;
|
|
continue;
|
|
- cpu_set(cpu, cpu_present_map);
|
|
|
|
- cpu_set(cpu, cpu_possible_map);
|
|
|
|
|
|
+ set_cpu_present(cpu, true);
|
|
|
|
+ set_cpu_possible(cpu, true);
|
|
ia64_cpu_to_sapicid[cpu] = sapicid;
|
|
ia64_cpu_to_sapicid[cpu] = sapicid;
|
|
cpu++;
|
|
cpu++;
|
|
}
|
|
}
|
|
@@ -626,12 +626,9 @@ smp_prepare_cpus (unsigned int max_cpus)
|
|
*/
|
|
*/
|
|
if (!max_cpus) {
|
|
if (!max_cpus) {
|
|
printk(KERN_INFO "SMP mode deactivated.\n");
|
|
printk(KERN_INFO "SMP mode deactivated.\n");
|
|
- cpus_clear(cpu_online_map);
|
|
|
|
- cpus_clear(cpu_present_map);
|
|
|
|
- cpus_clear(cpu_possible_map);
|
|
|
|
- cpu_set(0, cpu_online_map);
|
|
|
|
- cpu_set(0, cpu_present_map);
|
|
|
|
- cpu_set(0, cpu_possible_map);
|
|
|
|
|
|
+ init_cpu_online(cpumask_of(0));
|
|
|
|
+ init_cpu_present(cpumask_of(0));
|
|
|
|
+ init_cpu_possible(cpumask_of(0));
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|