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

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>

8 files changed, 18 insertions, 18 deletions

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index d541671caf4a..c4f41aca107f 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -924,9 +924,9 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
         buffer.length = ACPI_ALLOCATE_BUFFER;
         buffer.pointer = NULL;
 
-        cpus_complement(tmp_map, cpu_present_map);
-        cpu = first_cpu(tmp_map);
-        if (cpu >= NR_CPUS)
+        cpumask_complement(&tmp_map, cpu_present_mask);
+        cpu = cpumask_first(&tmp_map);
+        if (cpu >= nr_cpu_ids)
                 return -EINVAL;
 
         acpi_map_cpu2node(handle, cpu, physid);
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index bab1de2d2f6a..8f33a8840422 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1456,9 +1456,9 @@ ia64_mca_cmc_int_caller(int cmc_irq, void *arg)
 
         ia64_mca_cmc_int_handler(cmc_irq, arg);
 
-        for (++cpuid ; cpuid < NR_CPUS && !cpu_online(cpuid) ; cpuid++);
+        cpuid = cpumask_next(cpuid+1, cpu_online_mask);
 
-        if (cpuid < NR_CPUS) {
+        if (cpuid < nr_cpu_ids) {
                 platform_send_ipi(cpuid, IA64_CMCP_VECTOR, IA64_IPI_DM_INT, 0);
         } else {
                 /* If no log record, switch out of polling mode */
@@ -1525,7 +1525,7 @@ ia64_mca_cpe_int_caller(int cpe_irq, void *arg)
 
         ia64_mca_cpe_int_handler(cpe_irq, arg);
 
-        for (++cpuid ; cpuid < NR_CPUS && !cpu_online(cpuid) ; cpuid++);
+        cpuid = cpumask_next(cpuid+1, cpu_online_mask);
 
         if (cpuid < NR_CPUS) {
                 platform_send_ipi(cpuid, IA64_CPEP_VECTOR, IA64_IPI_DM_INT, 0);
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 0e499757309b..6fc1e638f0eb 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -5603,7 +5603,7 @@ pfm_interrupt_handler(int irq, void *arg)
  * /proc/perfmon interface, for debug only
  */
 
-#define PFM_PROC_SHOW_HEADER    ((void *)NR_CPUS+1)
+#define PFM_PROC_SHOW_HEADER    ((void *)nr_cpu_ids+1)
 
 static void *
 pfm_proc_start(struct seq_file *m, loff_t *pos)
@@ -5612,7 +5612,7 @@ pfm_proc_start(struct seq_file *m, loff_t *pos)
                 return PFM_PROC_SHOW_HEADER;
         }
 
-        while (*pos <= NR_CPUS) {
+        while (*pos <= nr_cpu_ids) {
                 if (cpu_online(*pos - 1)) {
                         return (void *)*pos;
                 }
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index ecb9eb78d687..7053c55b7649 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -317,7 +317,7 @@ retry:
         }
 
         n = data->cpu_check;
-        for (i = 0; i < NR_CPUS; i++) {
+        for (i = 0; i < nr_cpu_ids; i++) {
                 if (cpu_isset(n, data->cpu_event)) {
                         if (!cpu_online(n)) {
                                 cpu_clear(n, data->cpu_event);
@@ -326,7 +326,7 @@ retry:
                         cpu = n;
                         break;
                 }
-                if (++n == NR_CPUS)
+                if (++n == nr_cpu_ids)
                         n = 0;
         }
 
@@ -337,7 +337,7 @@ retry:
 
         /* for next read, start checking at next CPU */
         data->cpu_check = cpu;
-        if (++data->cpu_check == NR_CPUS)
+        if (++data->cpu_check == nr_cpu_ids)
                 data->cpu_check = 0;
 
         snprintf(cmd, sizeof(cmd), "read %d\n", cpu);
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 865af27c7737..ae9ec3dc76b8 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -730,10 +730,10 @@ static void *
 c_start (struct seq_file *m, loff_t *pos)
 {
 #ifdef CONFIG_SMP
-        while (*pos < NR_CPUS && !cpu_isset(*pos, cpu_online_map))
+        while (*pos < nr_cpu_ids && !cpu_online(*pos))
                 ++*pos;
 #endif
-        return *pos < NR_CPUS ? cpu_data(*pos) : NULL;
+        return *pos < nr_cpu_ids ? cpu_data(*pos) : NULL;
 }
 
 static void *
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 02c5b8a9fb60..12097776afc0 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -750,7 +750,7 @@ nasid_slice_to_cpuid(int nasid, int slice)
 {
         long cpu;
 
-        for (cpu = 0; cpu < NR_CPUS; cpu++)
+        for (cpu = 0; cpu < nr_cpu_ids; cpu++)
                 if (cpuid_to_nasid(cpu) == nasid &&
                                         cpuid_to_slice(cpu) == slice)
                         return cpu;
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c
index e585f9a2afb9..209e1eb467da 100644
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
@@ -461,7 +461,7 @@ bool sn_cpu_disable_allowed(int cpu)
 
 static void *sn2_ptc_seq_start(struct seq_file *file, loff_t * offset)
 {
-        if (*offset < NR_CPUS)
+        if (*offset < nr_cpu_ids)
                 return offset;
         return NULL;
 }
@@ -469,7 +469,7 @@ static void *sn2_ptc_seq_start(struct seq_file *file, loff_t * offset)
 static void *sn2_ptc_seq_next(struct seq_file *file, void *data, loff_t * offset)
 {
         (*offset)++;
-        if (*offset < NR_CPUS)
+        if (*offset < nr_cpu_ids)
                 return offset;
         return NULL;
 }
@@ -491,7 +491,7 @@ static int sn2_ptc_seq_show(struct seq_file *file, void *data)
                 seq_printf(file, "# ptctest %d, flushopt %d\n", sn2_ptctest, sn2_flush_opt);
         }
 
-        if (cpu < NR_CPUS && cpu_online(cpu)) {
+        if (cpu < nr_cpu_ids && cpu_online(cpu)) {
                 stat = &per_cpu(ptcstats, cpu);
                 seq_printf(file, "cpu %d %ld %ld %ld %ld %ld %ld %ld %ld %ld %ld %ld %ld\n", cpu, stat->ptc_l,
                                 stat->change_rid, stat->shub_ptc_flushes, stat->nodes_flushed,
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index be339477f906..45f3c2390428 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -612,7 +612,7 @@ static int sn_hwperf_op_cpu(struct sn_hwperf_op_info *op_info)
         op_info->a->arg &= SN_HWPERF_ARG_OBJID_MASK;
 
         if (cpu != SN_HWPERF_ARG_ANY_CPU) {
-                if (cpu >= NR_CPUS || !cpu_online(cpu)) {
+                if (cpu >= nr_cpu_ids || !cpu_online(cpu)) {
                         r = -EINVAL;
                         goto out;
                 }