cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: sparc64

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 <rusty@rustcorp.com.au>
Signed-off-by: Mike Travis <travis@sgi.com>
Acked-by: Ingo Molnar <mingo@elte.hu>

3 files changed, 4 insertions, 4 deletions

diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index 57c39843fb2a..90350f838f05 100644
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
@@ -653,7 +653,7 @@ static void __cpuinit dr_cpu_data(struct ds_info *dp,
                 if (cpu_list[i] == CPU_SENTINEL)
                         continue;
 
-                if (cpu_list[i] < NR_CPUS)
+                if (cpu_list[i] < nr_cpu_ids)
                         cpu_set(cpu_list[i], mask);
         }
 
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
index 1c378d8e90c5..640631b170ab 100644
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
@@ -265,12 +265,12 @@ static int irq_choose_cpu(unsigned int virt_irq)
                 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/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 00373ce2d8fb..2c8dfeb7ab04 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1092,7 +1092,7 @@ static void __init numa_parse_mdesc_group_cpus(struct mdesc_handle *md,
                 if (strcmp(name, "cpu"))
                         continue;
                 id = mdesc_get_property(md, target, "id", NULL);
-                if (*id < NR_CPUS)
+                if (*id < nr_cpu_ids)
                         cpu_set(*id, *mask);
         }
 }