[PATCH] more for_each_cpu() conversions

When we stop allocating percpu memory for not-possible CPUs we must not touch
the percpu data for not-possible CPUs at all.  The correct way of doing this
is to test cpu_possible() or to use for_each_cpu().

This patch is a kernel-wide sweep of all instances of NR_CPUS.  I found very
few instances of this bug, if any.  But the patch converts lots of open-coded
test to use the preferred helper macros.

Cc: Mikael Starvik <starvik@axis.com>
Cc: David Howells <dhowells@redhat.com>
Acked-by: Kyle McMartin <kyle@parisc-linux.org>
Cc: Anton Blanchard <anton@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: William Lee Irwin III <wli@holomorphy.com>
Cc: Andi Kleen <ak@muc.de>
Cc: Christian Zankel <chris@zankel.net>
Cc: Philippe Elie <phil.el@wanadoo.fr>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Jens Axboe <axboe@suse.de>
Cc: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 12 insertions, 18 deletions

diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 373a701c90a..1b6e2ade100 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -57,25 +57,21 @@ void smp_info(struct seq_file *m)
         int i;
         
         seq_printf(m, "State:\n");
-        for (i = 0; i < NR_CPUS; i++) {
-                if (cpu_online(i))
-                        seq_printf(m,
-                                   "CPU%d:\t\tonline\n", i);
-        }
+        for_each_online_cpu(i)
+                seq_printf(m, "CPU%d:\t\tonline\n", i);
 }
 
 void smp_bogo(struct seq_file *m)
 {
         int i;
         
-        for (i = 0; i < NR_CPUS; i++)
-                if (cpu_online(i))
-                        seq_printf(m,
-                                   "Cpu%dBogo\t: %lu.%02lu\n"
-                                   "Cpu%dClkTck\t: %016lx\n",
-                                   i, cpu_data(i).udelay_val / (500000/HZ),
-                                   (cpu_data(i).udelay_val / (5000/HZ)) % 100,
-                                   i, cpu_data(i).clock_tick);
+        for_each_online_cpu(i)
+                seq_printf(m,
+                           "Cpu%dBogo\t: %lu.%02lu\n"
+                           "Cpu%dClkTck\t: %016lx\n",
+                           i, cpu_data(i).udelay_val / (500000/HZ),
+                           (cpu_data(i).udelay_val / (5000/HZ)) % 100,
+                           i, cpu_data(i).clock_tick);
 }
 
 void __init smp_store_cpu_info(int id)
@@ -1282,7 +1278,7 @@ int setup_profiling_timer(unsigned int multiplier)
                 return -EINVAL;
 
         spin_lock_irqsave(&prof_setup_lock, flags);
-        for (i = 0; i < NR_CPUS; i++)
+        for_each_cpu(i)
                 prof_multiplier(i) = multiplier;
         current_tick_offset = (timer_tick_offset / multiplier);
         spin_unlock_irqrestore(&prof_setup_lock, flags);
@@ -1384,10 +1380,8 @@ void __init smp_cpus_done(unsigned int max_cpus)
         unsigned long bogosum = 0;
         int i;
 
-        for (i = 0; i < NR_CPUS; i++) {
-                if (cpu_online(i))
-                        bogosum += cpu_data(i).udelay_val;
-        }
+        for_each_online_cpu(i)
+                bogosum += cpu_data(i).udelay_val;
         printk("Total of %ld processors activated "
                "(%lu.%02lu BogoMIPS).\n",
                (long) num_online_cpus(),