2 files changed, 13 insertions, 21 deletions

diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index 8c93ba655b33..e505a4125e35 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -117,9 +117,7 @@ int show_interrupts(struct seq_file *p, void *v)
 #ifndef CONFIG_SMP
                 seq_printf(p, "%10u ", kstat_irqs(i));
 #else
-                for (j = 0; j < NR_CPUS; j++) {
-                        if (!cpu_online(j))
-                                continue;
+                for_each_online_cpu(j) {
                         seq_printf(p, "%10u ",
                                    kstat_cpu(j).irqs[i]);
                 }
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 373a701c90a5..1b6e2ade1008 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(),