1 files changed, 5 insertions, 5 deletions

diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
index 6e2c4efce0e..8acbf0cdf1a 100644
--- a/arch/x86/mach-voyager/voyager_smp.c
+++ b/arch/x86/mach-voyager/voyager_smp.c
@@ -113,7 +113,7 @@ static inline void send_QIC_CPI(__u32 cpuset, __u8 cpi)
         for_each_online_cpu(cpu) {
                 if (cpuset & (1 << cpu)) {
 #ifdef VOYAGER_DEBUG
-                        if (!cpu_isset(cpu, cpu_online_map))
+                        if (!cpu_online(cpu))
                                 VDEBUG(("CPU%d sending cpi %d to CPU%d not in "
                                         "cpu_online_map\n",
                                         hard_smp_processor_id(), cpi, cpu));
@@ -683,9 +683,9 @@ void __init smp_boot_cpus(void)
          * Code added from smpboot.c */
         {
                 unsigned long bogosum = 0;
-                for (i = 0; i < NR_CPUS; i++)
-                        if (cpu_isset(i, cpu_online_map))
-                                bogosum += cpu_data(i).loops_per_jiffy;
+
+                for_each_online_cpu(i)
+                        bogosum += cpu_data(i).loops_per_jiffy;
                 printk(KERN_INFO "Total of %d processors activated "
                        "(%lu.%02lu BogoMIPS).\n",
                        cpucount + 1, bogosum / (500000 / HZ),
@@ -1838,7 +1838,7 @@ static int __cpuinit voyager_cpu_up(unsigned int cpu)
                 return -EIO;
         /* Unleash the CPU! */
         cpu_set(cpu, smp_commenced_mask);
-        while (!cpu_isset(cpu, cpu_online_map))
+        while (!cpu_online(cpu))
                 mb();
         return 0;
 }