2 files changed, 4 insertions, 5 deletions

diff --git a/include/asm-alpha/mmu_context.h b/include/asm-alpha/mmu_context.h
index 6f92482cc96c..0c017fc181c1 100644
--- a/include/asm-alpha/mmu_context.h
+++ b/include/asm-alpha/mmu_context.h
@@ -231,9 +231,8 @@ init_new_context(struct task_struct *tsk, struct mm_struct *mm)
 {
         int i;
 
-        for (i = 0; i < NR_CPUS; i++)
-                if (cpu_online(i))
-                        mm->context[i] = 0;
+        for_each_online_cpu(i)
+                mm->context[i] = 0;
         if (tsk != current)
                 task_thread_info(tsk)->pcb.ptbr
                   = ((unsigned long)mm->pgd - IDENT_ADDR) >> PAGE_SHIFT;
diff --git a/include/asm-alpha/topology.h b/include/asm-alpha/topology.h
index eb740e280d9c..420ccde6b916 100644
--- a/include/asm-alpha/topology.h
+++ b/include/asm-alpha/topology.h
@@ -27,8 +27,8 @@ static inline cpumask_t node_to_cpumask(int node)
         cpumask_t node_cpu_mask = CPU_MASK_NONE;
         int cpu;
 
-        for(cpu = 0; cpu < NR_CPUS; cpu++) {
-                if (cpu_online(cpu) && (cpu_to_node(cpu) == node))
+        for_each_online_cpu(cpu) {
+                if (cpu_to_node(cpu) == node)
                         cpu_set(cpu, node_cpu_mask);
         }