Pull cpumask into release branch

1 files changed, 3 insertions, 3 deletions

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);