commit 320e6aba26892b016293190e079f15e83a5c28b9
author Ralf Baechle <ralf@linux-mips.org> Mon May 22 14:24:04 2006 +0100
committer Ralf Baechle <ralf@linux-mips.org> Tue Jun 06 00:15:09 2006 +0100
tree 7f34e8a920fcef01469810502e3cec8f66395d2b
parent acf518cbba773e2c20fe313acb340da65001c7a8

[MIPS] Fix SMP now that fixup_cpu_present_map is gone.
    
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

arch/mips/kernel/smp.c

diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index d42f358..298f82f 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -247,6 +247,9 @@
 	current_thread_info()->cpu = 0;
 	smp_tune_scheduling();
 	plat_prepare_cpus(max_cpus);
+#ifndef CONFIG_HOTPLUG_CPU
+	cpu_present_map = cpu_possible_map;
+#endif
 }
 
 /* preload SMP state for boot cpu */
@@ -442,7 +445,7 @@
 	int cpu;
 	int ret;
 
-	for_each_cpu(cpu) {
+	for_each_present_cpu(cpu) {
 		ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu, NULL);
 		if (ret)
 			printk(KERN_WARNING "topology_init: register_cpu %d "