cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: powerpc 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/powerpc/include/asm/cputhreads.h | 2 +- arch/powerpc/kernel/irq.c | 2 +- arch/powerpc/kernel/machine_kexec_64.c | 2 +- arch/powerpc/kernel/process.c | 2 +- arch/powerpc/kernel/setup-common.c | 10 +++++----- arch/powerpc/mm/numa.c | 4 ++-- arch/powerpc/platforms/powermac/smp.c | 6 +++--- arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- arch/powerpc/platforms/pseries/rtasd.c | 2 +- arch/powerpc/platforms/pseries/xics.c | 2 +- arch/powerpc/sysdev/mpic.c | 4 ++-- arch/powerpc/xmon/xmon.c | 4 ++-- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/arch/powerpc/include/asm/cputhreads.h b/arch/powerpc/include/asm/cputhreads.h --- a/arch/powerpc/include/asm/cputhreads.h +++ b/arch/powerpc/include/asm/cputhreads.h @@ -34,7 +34,7 @@ static inline cpumask_t cpu_thread_mask_ int i; res = CPU_MASK_NONE; - for (i = 0; i < NR_CPUS; i += threads_per_core) { + for (i = 0; i < nr_cpu_ids; i += threads_per_core) { cpus_shift_left(tmp, threads_core_mask, i); if (cpus_intersects(threads, tmp)) cpu_set(i, res); diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -240,7 +240,7 @@ void fixup_irqs(cpumask_t map) continue; cpumask_and(&mask, irq_desc[irq].affinity, &map); - if (any_online_cpu(mask) == NR_CPUS) { + if (cpumask_any_and(&mask, cpu_online_mask) >= nr_cpu_ids) { printk("Breaking affinity for irq %i\n", irq); mask = map; } diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c --- a/arch/powerpc/kernel/machine_kexec_64.c +++ b/arch/powerpc/kernel/machine_kexec_64.c @@ -176,7 +176,7 @@ static void kexec_prepare_cpus(void) my_cpu = get_cpu(); /* check the others cpus are now down (via paca hw cpu id == -1) */ - for (i=0; i < NR_CPUS; i++) { + for (i = 0; i < nr_cpu_ids; i++) { if (i == my_cpu) continue; diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -947,7 +947,7 @@ static inline int valid_irq_stack(unsign * Avoid crashing if the stack has overflowed and corrupted * task_cpu(p), which is in the thread_info struct. */ - if (cpu < NR_CPUS && cpu_possible(cpu)) { + if (cpu < nr_cpu_ids && cpu_possible(cpu)) { stack_page = (unsigned long) hardirq_ctx[cpu]; if (sp >= stack_page + sizeof(struct thread_struct) && sp <= stack_page + THREAD_SIZE - nbytes) diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -168,7 +168,7 @@ static int show_cpuinfo(struct seq_file unsigned short maj; unsigned short min; - if (cpu_id == NR_CPUS) { + if (cpu_id == nr_cpu_ids) { struct device_node *root; const char *model = NULL; #if defined(CONFIG_SMP) && defined(CONFIG_PPC32) @@ -204,7 +204,7 @@ static int show_cpuinfo(struct seq_file /* We only show online cpus: disable preempt (overzealous, I * knew) to prevent cpu going down. */ preempt_disable(); - if (!cpu_online(cpu_id)) { + if (cpu_id >= nr_cpu_ids || !cpu_online(cpu_id)) { preempt_enable(); return 0; } @@ -315,7 +315,7 @@ static void *c_start(struct seq_file *m, { unsigned long i = *pos; - return i <= NR_CPUS ? (void *)(i + 1) : NULL; + return i <= nr_cpu_ids ? (void *)(i + 1) : NULL; } static void *c_next(struct seq_file *m, void *v, loff_t *pos) @@ -410,7 +410,7 @@ void __init smp_setup_cpu_maps(void) DBG("smp_setup_cpu_maps()\n"); - while ((dn = of_find_node_by_type(dn, "cpu")) && cpu < NR_CPUS) { + while ((dn = of_find_node_by_type(dn, "cpu")) && cpu < nr_cpu_ids) { const int *intserv; int j, len; @@ -429,7 +429,7 @@ void __init smp_setup_cpu_maps(void) intserv = &cpu; /* assume logical == phys */ } - for (j = 0; j < nthreads && cpu < NR_CPUS; j++) { + for (j = 0; j < nthreads && cpu < nr_cpu_ids; j++) { DBG(" thread %d -> cpu %d (hard id %d)\n", j, cpu, intserv[j]); set_cpu_present(cpu, true); diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -737,7 +737,7 @@ void __init dump_numa_cpu_topology(void) * If we used a CPU iterator here we would miss printing * the holes in the cpumap. */ - for (cpu = 0; cpu < NR_CPUS; cpu++) { + for (cpu = 0; cpu < nr_cpu_ids; cpu++) { if (cpu_isset(cpu, numa_cpumask_lookup_table[node])) { if (count == 0) printk(" %u", cpu); @@ -750,7 +750,7 @@ void __init dump_numa_cpu_topology(void) } if (count > 1) - printk("-%u", NR_CPUS - 1); + printk("-%u", nr_cpu_ids - 1); printk("\n"); } } diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c --- a/arch/powerpc/platforms/powermac/smp.c +++ b/arch/powerpc/platforms/powermac/smp.c @@ -317,8 +317,8 @@ static int __init smp_psurge_probe(void) * device tree for them, and smp_setup_cpu_maps hasn't * set their bits in cpu_present_map. */ - if (ncpus > NR_CPUS) - ncpus = NR_CPUS; + if (ncpus > nr_cpu_ids) + ncpus = nr_cpu_ids; for (i = 1; i < ncpus ; ++i) set_cpu_present(i, true); @@ -951,7 +951,7 @@ void __init pmac_setup_smp(void) */ int cpu; - for (cpu = 1; cpu < 4 && cpu < NR_CPUS; ++cpu) + for (cpu = 1; cpu < 4 && cpu < nr_cpu_ids; ++cpu) set_cpu_possible(cpu, true); smp_ops = &psurge_smp_ops; } diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c @@ -221,7 +221,7 @@ static void pseries_remove_processor(str set_hard_smp_processor_id(cpu, -1); break; } - if (cpu == NR_CPUS) + if (cpu >= nr_cpu_ids) printk(KERN_WARNING "Could not find cpu to remove " "with physical id 0x%x\n", intserv[i]); } diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c --- a/arch/powerpc/platforms/pseries/rtasd.c +++ b/arch/powerpc/platforms/pseries/rtasd.c @@ -406,7 +406,7 @@ static void rtas_event_scan(struct work_ get_online_cpus(); cpu = next_cpu(smp_processor_id(), cpu_online_map); - if (cpu == NR_CPUS) { + if (cpu >= nr_cpu_ids) { cpu = first_cpu(cpu_online_map); if (first_pass) { diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c @@ -165,7 +165,7 @@ static int get_irq_server(unsigned int v server = first_cpu(tmp); - if (server < NR_CPUS) + if (server < nr_cpu_ids) return get_hard_smp_processor_id(server); if (strict_check) diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c @@ -580,12 +580,12 @@ static int irq_choose_cpu(unsigned int v spin_lock_irqsave(&irq_rover_lock, flags); while (!cpu_online(irq_rover)) { - if (++irq_rover >= NR_CPUS) + if (++irq_rover >= nr_cpu_ids) irq_rover = 0; } cpuid = irq_rover; do { - if (++irq_rover >= NR_CPUS) + if (++irq_rover >= nr_cpu_ids) irq_rover = 0; } while (!cpu_online(irq_rover)); diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -939,7 +939,7 @@ static int cpu_cmd(void) /* print cpus waiting or in xmon */ printf("cpus stopped:"); count = 0; - for (cpu = 0; cpu < NR_CPUS; ++cpu) { + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) { if (cpu_isset(cpu, cpus_in_xmon)) { if (count == 0) printf(" %x", cpu); @@ -951,7 +951,7 @@ static int cpu_cmd(void) } } if (count > 1) - printf("-%x", NR_CPUS - 1); + printf("-%x", nr_cpu_ids - 1); printf("\n"); return 0; }