mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 17:12:06 +00:00
[SPARC64]: Keep cpu_present_map in sync with phys_cpu_present_map.
Don't rely on fixup_cpu_present_map() to do this as that function is about to be removed. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3cbb90a9cb
commit
7d3aee9a96
@ -1298,6 +1298,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
|
|||||||
while (!cpu_find_by_instance(instance, NULL, &mid)) {
|
while (!cpu_find_by_instance(instance, NULL, &mid)) {
|
||||||
if (mid != boot_cpu_id) {
|
if (mid != boot_cpu_id) {
|
||||||
cpu_clear(mid, phys_cpu_present_map);
|
cpu_clear(mid, phys_cpu_present_map);
|
||||||
|
cpu_clear(mid, cpu_present_map);
|
||||||
if (num_possible_cpus() <= max_cpus)
|
if (num_possible_cpus() <= max_cpus)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -1332,8 +1333,10 @@ void __init smp_setup_cpu_possible_map(void)
|
|||||||
|
|
||||||
instance = 0;
|
instance = 0;
|
||||||
while (!cpu_find_by_instance(instance, NULL, &mid)) {
|
while (!cpu_find_by_instance(instance, NULL, &mid)) {
|
||||||
if (mid < NR_CPUS)
|
if (mid < NR_CPUS) {
|
||||||
cpu_set(mid, phys_cpu_present_map);
|
cpu_set(mid, phys_cpu_present_map);
|
||||||
|
cpu_set(mid, cpu_present_map);
|
||||||
|
}
|
||||||
instance++;
|
instance++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user