Skip to content

L
linux-davinci-2.6.23
Commit 320e6aba authored by Ralf Baechle's avatar Ralf Baechle
Browse files
Options

[MIPS] Fix SMP now that fixup_cpu_present_map is gone. 

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent acf518cb
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
arch/mips/kernel/smp.c
View file @ 320e6aba
...@@ -247,6 +247,9 @@ void __init smp_prepare_cpus(unsigned int max_cpus) ...@@ -247,6 +247,9 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
current_thread_info()->cpu = 0; current_thread_info()->cpu = 0;
smp_tune_scheduling(); smp_tune_scheduling();
plat_prepare_cpus(max_cpus); plat_prepare_cpus(max_cpus);
#ifndef CONFIG_HOTPLUG_CPU
cpu_present_map = cpu_possible_map;
#endif
} }
/* preload SMP state for boot cpu */ /* preload SMP state for boot cpu */
...@@ -442,7 +445,7 @@ static int __init topology_init(void) ...@@ -442,7 +445,7 @@ static int __init topology_init(void)
int cpu; int cpu;
int ret; int ret;
for_each_cpu(cpu) { for_each_present_cpu(cpu) {
ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu, NULL); ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu, NULL);
if (ret) if (ret)
printk(KERN_WARNING "topology_init: register_cpu %d " printk(KERN_WARNING "topology_init: register_cpu %d "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment