Merge branch 'linus' into cpus4096

[linux-2.6-block.git] / kernel / cpu.c

diff --git a/kernel/cpu.c b/kernel/cpu.c
index b11f06dc149add3a29c072e2ec9356499dd9dbc1..b21ba7e9036dfcaa69594827973e3d5d2d2d7970 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -412,7 +412,7 @@ void __ref enable_nonboot_cpus(void)
                goto out;
 
        printk("Enabling non-boot CPUs ...\n");
-       for_each_cpu_mask(cpu, frozen_cpus) {
+       for_each_cpu_mask_nr(cpu, frozen_cpus) {
                error = _cpu_up(cpu, 1);
                if (!error) {
                        printk("CPU%d is up\n", cpu);