5 files changed, 26 insertions, 37 deletions

diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index 410b9a72aba9..4c60a6ef54a9 100644
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@@ -184,9 +184,8 @@ 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))
-                                seq_printf(p, "%10u ",
+                for_each_online_cpu(j) {
+                        seq_printf(p, "%10u ",
                                     kstat_cpu(cpu_logical_map(j)).irqs[i]);
                 }
 #endif
diff --git a/arch/sparc/kernel/smp.c b/arch/sparc/kernel/smp.c
index c6e721d8f477..ea5682ce7031 100644
--- a/arch/sparc/kernel/smp.c
+++ b/arch/sparc/kernel/smp.c
@@ -243,9 +243,8 @@ int setup_profiling_timer(unsigned int multiplier)
                 return -EINVAL;
 
         spin_lock_irqsave(&prof_setup_lock, flags);
-        for(i = 0; i < NR_CPUS; i++) {
-                if (cpu_possible(i))
-                        load_profile_irq(i, lvl14_resolution / multiplier);
+        for_each_cpu(i) {
+                load_profile_irq(i, lvl14_resolution / multiplier);
                 prof_multiplier(i) = multiplier;
         }
         spin_unlock_irqrestore(&prof_setup_lock, flags);
@@ -273,13 +272,12 @@ 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", 
-                                   i,
-                                   cpu_data(i).udelay_val/(500000/HZ),
-                                   (cpu_data(i).udelay_val/(5000/HZ))%100);
+        for_each_online_cpu(i) {
+                seq_printf(m,
+                           "Cpu%dBogo\t: %lu.%02lu\n",
+                           i,
+                           cpu_data(i).udelay_val/(500000/HZ),
+                           (cpu_data(i).udelay_val/(5000/HZ))%100);
         }
 }
 
@@ -288,8 +286,6 @@ 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\t: online\n", i);
-        }
+        for_each_online_cpu(i)
+                seq_printf(m, "CPU%d\t\t: online\n", i);
 }
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c
index 52621348a56c..cea7fc6fc6e5 100644
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@@ -103,11 +103,9 @@ found_it:	seq_printf(p, "%3d: ", i);
 #ifndef CONFIG_SMP
                 seq_printf(p, "%10u ", kstat_irqs(i));
 #else
-                for (x = 0; x < NR_CPUS; x++) {
-                        if (cpu_online(x))
-                                seq_printf(p, "%10u ",
-                                       kstat_cpu(cpu_logical_map(x)).irqs[i]);
-                }
+                for_each_online_cpu(x)
+                        seq_printf(p, "%10u ",
+                               kstat_cpu(cpu_logical_map(x)).irqs[i]);
 #endif
                 seq_printf(p, "%c %s",
                         (action->flags & SA_INTERRUPT) ? '+' : ' ',
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index 40d426cce824..41bb9596be48 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -249,11 +249,9 @@ void __init smp4d_boot_cpus(void)
         } else {
                 unsigned long bogosum = 0;
                 
-                for(i = 0; i < NR_CPUS; i++) {
-                        if (cpu_isset(i, cpu_present_map)) {
-                                bogosum += cpu_data(i).udelay_val;
-                                smp_highest_cpu = i;
-                        }
+                for_each_present_cpu(i) {
+                        bogosum += cpu_data(i).udelay_val;
+                        smp_highest_cpu = i;
                 }
                 SMP_PRINTK(("Total of %d Processors activated (%lu.%02lu BogoMIPS).\n", cpucount + 1, bogosum/(500000/HZ), (bogosum/(5000/HZ))%100));
                 printk("Total of %d Processors activated (%lu.%02lu BogoMIPS).\n",
@@ -266,19 +264,19 @@ void __init smp4d_boot_cpus(void)
 
         /* Free unneeded trap tables */
         ClearPageReserved(virt_to_page(trapbase_cpu1));
-        set_page_count(virt_to_page(trapbase_cpu1), 1);
+        init_page_count(virt_to_page(trapbase_cpu1));
         free_page((unsigned long)trapbase_cpu1);
         totalram_pages++;
         num_physpages++;
 
         ClearPageReserved(virt_to_page(trapbase_cpu2));
-        set_page_count(virt_to_page(trapbase_cpu2), 1);
+        init_page_count(virt_to_page(trapbase_cpu2));
         free_page((unsigned long)trapbase_cpu2);
         totalram_pages++;
         num_physpages++;
 
         ClearPageReserved(virt_to_page(trapbase_cpu3));
-        set_page_count(virt_to_page(trapbase_cpu3), 1);
+        init_page_count(virt_to_page(trapbase_cpu3));
         free_page((unsigned long)trapbase_cpu3);
         totalram_pages++;
         num_physpages++;
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c
index a21f27d10e55..1dde312eebda 100644
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
@@ -218,10 +218,8 @@ void __init smp4m_boot_cpus(void)
                 cpu_present_map = cpumask_of_cpu(smp_processor_id());
         } else {
                 unsigned long bogosum = 0;
-                for(i = 0; i < NR_CPUS; i++) {
-                        if (cpu_isset(i, cpu_present_map))
-                                bogosum += cpu_data(i).udelay_val;
-                }
+                for_each_present_cpu(i)
+                        bogosum += cpu_data(i).udelay_val;
                 printk("Total of %d Processors activated (%lu.%02lu BogoMIPS).\n",
                        cpucount + 1,
                        bogosum/(500000/HZ),
@@ -233,21 +231,21 @@ void __init smp4m_boot_cpus(void)
         /* Free unneeded trap tables */
         if (!cpu_isset(i, cpu_present_map)) {
                 ClearPageReserved(virt_to_page(trapbase_cpu1));
-                set_page_count(virt_to_page(trapbase_cpu1), 1);
+                init_page_count(virt_to_page(trapbase_cpu1));
                 free_page((unsigned long)trapbase_cpu1);
                 totalram_pages++;
                 num_physpages++;
         }
         if (!cpu_isset(2, cpu_present_map)) {
                 ClearPageReserved(virt_to_page(trapbase_cpu2));
-                set_page_count(virt_to_page(trapbase_cpu2), 1);
+                init_page_count(virt_to_page(trapbase_cpu2));
                 free_page((unsigned long)trapbase_cpu2);
                 totalram_pages++;
                 num_physpages++;
         }
         if (!cpu_isset(3, cpu_present_map)) {
                 ClearPageReserved(virt_to_page(trapbase_cpu3));
-                set_page_count(virt_to_page(trapbase_cpu3), 1);
+                init_page_count(virt_to_page(trapbase_cpu3));
                 free_page((unsigned long)trapbase_cpu3);
                 totalram_pages++;
                 num_physpages++;