cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits: net

In future all cpumask ops will only be valid (in general) for bit
numbers < nr_cpu_ids.  So use that instead of NR_CPUS in iterators
and other comparisons.

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 9c3717a23cf..f66c58df895 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2414,7 +2414,7 @@ static void *neigh_stat_seq_start(struct seq_file *seq, loff_t *pos)
         if (*pos == 0)
                 return SEQ_START_TOKEN;
 
-        for (cpu = *pos-1; cpu < NR_CPUS; ++cpu) {
+        for (cpu = *pos-1; cpu < nr_cpu_ids; ++cpu) {
                 if (!cpu_possible(cpu))
                         continue;
                 *pos = cpu+1;
@@ -2429,7 +2429,7 @@ static void *neigh_stat_seq_next(struct seq_file *seq, void *v, loff_t *pos)
         struct neigh_table *tbl = pde->data;
         int cpu;
 
-        for (cpu = *pos; cpu < NR_CPUS; ++cpu) {
+        for (cpu = *pos; cpu < nr_cpu_ids; ++cpu) {
                 if (!cpu_possible(cpu))
                         continue;
                 *pos = cpu+1;