cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: alpha From: Rusty Russell Impact: cleanup, futureproof In fact, all cpumask ops will only be valid (in general) for bit numbers < nr_cpu_ids. So use that instead of NR_CPUS in various places. This is always safe: no cpu number can be >= nr_cpu_ids, and nr_cpu_ids is initialized to NR_CPUS at boot. Signed-off-by: Rusty Russell Signed-off-by: Mike Travis Acked-by: Ingo Molnar --- arch/alpha/kernel/irq.c | 2 +- arch/alpha/kernel/smp.c | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c --- a/arch/alpha/kernel/irq.c +++ b/arch/alpha/kernel/irq.c @@ -52,7 +52,7 @@ int irq_select_affinity(unsigned int irq while (!cpu_possible(cpu) || !cpumask_test_cpu(cpu, irq_default_affinity)) - cpu = (cpu < (NR_CPUS-1) ? cpu + 1 : 0); + cpu = (cpu < (nr_cpu_ids-1) ? cpu + 1 : 0); last_cpu = cpu; cpumask_copy(irq_desc[irq].affinity, cpumask_of(cpu)); diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c --- a/arch/alpha/kernel/smp.c +++ b/arch/alpha/kernel/smp.c @@ -500,9 +500,8 @@ smp_cpus_done(unsigned int max_cpus) int cpu; unsigned long bogosum = 0; - for(cpu = 0; cpu < NR_CPUS; cpu++) - if (cpu_online(cpu)) - bogosum += cpu_data[cpu].loops_per_jiffy; + for_each_online_cpu(cpu) + bogosum += cpu_data[cpu].loops_per_jiffy; printk(KERN_INFO "SMP: Total of %d processors activated " "(%lu.%02lu BogoMIPS).\n", @@ -701,8 +700,8 @@ flush_tlb_mm(struct mm_struct *mm) flush_tlb_current(mm); if (atomic_read(&mm->mm_users) <= 1) { int cpu, this_cpu = smp_processor_id(); - for (cpu = 0; cpu < NR_CPUS; cpu++) { - if (!cpu_online(cpu) || cpu == this_cpu) + for_each_online_cpu(cpu) { + if (cpu == this_cpu) continue; if (mm->context[cpu]) mm->context[cpu] = 0; @@ -750,8 +749,8 @@ flush_tlb_page(struct vm_area_struct *vm flush_tlb_current_page(mm, vma, addr); if (atomic_read(&mm->mm_users) <= 1) { int cpu, this_cpu = smp_processor_id(); - for (cpu = 0; cpu < NR_CPUS; cpu++) { - if (!cpu_online(cpu) || cpu == this_cpu) + for_each_online_cpu(cpu) { + if (cpu == this_cpu) continue; if (mm->context[cpu]) mm->context[cpu] = 0; @@ -806,8 +805,8 @@ flush_icache_user_range(struct vm_area_s __load_new_mm_context(mm); if (atomic_read(&mm->mm_users) <= 1) { int cpu, this_cpu = smp_processor_id(); - for (cpu = 0; cpu < NR_CPUS; cpu++) { - if (!cpu_online(cpu) || cpu == this_cpu) + for_each_online_cpu(cpu) { + if (cpu == this_cpu) continue; if (mm->context[cpu]) mm->context[cpu] = 0;