2 files changed, 4 insertions, 6 deletions

diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index 6883c00728cb..b56e79632f24 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -35,9 +35,8 @@ int show_interrupts(struct seq_file *p, void *v)
 
         if (i == 0) {
                 seq_puts(p, "           ");
-                for (j=0; j<NR_CPUS; j++)
-                        if (cpu_online(j))
-                                seq_printf(p, "CPU%d       ",j);
+                for_each_online_cpu(j)
+                        seq_printf(p, "CPU%d       ",j);
                 seq_putc(p, '\n');
         }
 
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index a067a34e0b64..c0e79843f580 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -404,9 +404,8 @@ static int __init topology_init(void)
 {
         int cpu_id;
 
-        for (cpu_id = 0; cpu_id < NR_CPUS; cpu_id++)
-                if (cpu_possible(cpu_id))
-                        register_cpu(&cpu[cpu_id], cpu_id, NULL);
+        for_each_cpu(cpu_id)
+                register_cpu(&cpu[cpu_id], cpu_id, NULL);
 
         return 0;
 }