1 files changed, 6 insertions, 8 deletions

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++;