diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-05-22 14:24:04 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2006-06-06 00:15:09 +0100 |
| commit | 320e6aba26892b016293190e079f15e83a5c28b9 (patch) | |
| tree | 7f34e8a920fcef01469810502e3cec8f66395d2b /arch | |
| parent | acf518cbba773e2c20fe313acb340da65001c7a8 (diff) | |
| download | linux-stable-320e6aba26892b016293190e079f15e83a5c28b9.tar.gz linux-stable-320e6aba26892b016293190e079f15e83a5c28b9.tar.bz2 linux-stable-320e6aba26892b016293190e079f15e83a5c28b9.zip | |
[MIPS] Fix SMP now that fixup_cpu_present_map is gone.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/kernel/smp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c index d42f358754ad..298f82fe8440 100644 --- a/arch/mips/kernel/smp.c +++ b/arch/mips/kernel/smp.c @@ -247,6 +247,9 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 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 @@ static int __init topology_init(void) 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 " |