ia64: fix up obsolete cpu function usage.

Thanks to spatch, then a sweep for for_each_cpu_mask => for_each_cpu.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org

1 files changed, 22 insertions, 20 deletions

diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 547a48d78bd7..15051e9c2c6f 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -434,7 +434,7 @@ smp_callin (void)
         /*
          * Allow the master to continue.
          */
-        cpu_set(cpuid, cpu_callin_map);
+        cpumask_set_cpu(cpuid, &cpu_callin_map);
         Dprintk("Stack on CPU %d at about %p\n",cpuid, &cpuid);
 }
 
@@ -475,13 +475,13 @@ do_boot_cpu (int sapicid, int cpu, struct task_struct *idle)
          */
         Dprintk("Waiting on callin_map ...");
         for (timeout = 0; timeout < 100000; timeout++) {
-                if (cpu_isset(cpu, cpu_callin_map))
+                if (cpumask_test_cpu(cpu, &cpu_callin_map))
                         break;  /* It has booted */
                 udelay(100);
         }
         Dprintk("\n");
 
-        if (!cpu_isset(cpu, cpu_callin_map)) {
+        if (!cpumask_test_cpu(cpu, &cpu_callin_map)) {
                 printk(KERN_ERR "Processor 0x%x/0x%x is stuck.\n", cpu, sapicid);
                 ia64_cpu_to_sapicid[cpu] = -1;
                 set_cpu_online(cpu, false);  /* was set in smp_callin() */
@@ -541,7 +541,7 @@ smp_prepare_cpus (unsigned int max_cpus)
 
         smp_setup_percpu_timer();
 
-        cpu_set(0, cpu_callin_map);
+        cpumask_set_cpu(0, &cpu_callin_map);
 
         local_cpu_data->loops_per_jiffy = loops_per_jiffy;
         ia64_cpu_to_sapicid[0] = boot_cpu_id;
@@ -565,7 +565,7 @@ smp_prepare_cpus (unsigned int max_cpus)
 void smp_prepare_boot_cpu(void)
 {
         set_cpu_online(smp_processor_id(), true);
-        cpu_set(smp_processor_id(), cpu_callin_map);
+        cpumask_set_cpu(smp_processor_id(), &cpu_callin_map);
         set_numa_node(cpu_to_node_map[smp_processor_id()]);
         per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
         paravirt_post_smp_prepare_boot_cpu();
@@ -577,10 +577,10 @@ clear_cpu_sibling_map(int cpu)
 {
         int i;
 
-        for_each_cpu_mask(i, per_cpu(cpu_sibling_map, cpu))
-                cpu_clear(cpu, per_cpu(cpu_sibling_map, i));
-        for_each_cpu_mask(i, cpu_core_map[cpu])
-                cpu_clear(cpu, cpu_core_map[i]);
+        for_each_cpu(i, &per_cpu(cpu_sibling_map, cpu))
+                cpumask_clear_cpu(cpu, &per_cpu(cpu_sibling_map, i));
+        for_each_cpu(i, &cpu_core_map[cpu])
+                cpumask_clear_cpu(cpu, &cpu_core_map[i]);
 
         per_cpu(cpu_sibling_map, cpu) = cpu_core_map[cpu] = CPU_MASK_NONE;
 }
@@ -592,12 +592,12 @@ remove_siblinginfo(int cpu)
 
         if (cpu_data(cpu)->threads_per_core == 1 &&
             cpu_data(cpu)->cores_per_socket == 1) {
-                cpu_clear(cpu, cpu_core_map[cpu]);
-                cpu_clear(cpu, per_cpu(cpu_sibling_map, cpu));
+                cpumask_clear_cpu(cpu, &cpu_core_map[cpu]);
+                cpumask_clear_cpu(cpu, &per_cpu(cpu_sibling_map, cpu));
                 return;
         }
 
-        last = (cpus_weight(cpu_core_map[cpu]) == 1 ? 1 : 0);
+        last = (cpumask_weight(&cpu_core_map[cpu]) == 1 ? 1 : 0);
 
         /* remove it from all sibling map's */
         clear_cpu_sibling_map(cpu);
@@ -673,7 +673,7 @@ int __cpu_disable(void)
         remove_siblinginfo(cpu);
         fixup_irqs();
         local_flush_tlb_all();
-        cpu_clear(cpu, cpu_callin_map);
+        cpumask_clear_cpu(cpu, &cpu_callin_map);
         return 0;
 }
 
@@ -718,11 +718,13 @@ static inline void set_cpu_sibling_map(int cpu)
 
         for_each_online_cpu(i) {
                 if ((cpu_data(cpu)->socket_id == cpu_data(i)->socket_id)) {
-                        cpu_set(i, cpu_core_map[cpu]);
-                        cpu_set(cpu, cpu_core_map[i]);
+                        cpumask_set_cpu(i, &cpu_core_map[cpu]);
+                        cpumask_set_cpu(cpu, &cpu_core_map[i]);
                         if (cpu_data(cpu)->core_id == cpu_data(i)->core_id) {
-                                cpu_set(i, per_cpu(cpu_sibling_map, cpu));
-                                cpu_set(cpu, per_cpu(cpu_sibling_map, i));
+                                cpumask_set_cpu(i,
+                                                &per_cpu(cpu_sibling_map, cpu));
+                                cpumask_set_cpu(cpu,
+                                                &per_cpu(cpu_sibling_map, i));
                         }
                 }
         }
@@ -742,7 +744,7 @@ __cpu_up(unsigned int cpu, struct task_struct *tidle)
          * Already booted cpu? not valid anymore since we dont
          * do idle loop tightspin anymore.
          */
-        if (cpu_isset(cpu, cpu_callin_map))
+        if (cpumask_test_cpu(cpu, &cpu_callin_map))
                 return -EINVAL;
 
         per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
@@ -753,8 +755,8 @@ __cpu_up(unsigned int cpu, struct task_struct *tidle)
 
         if (cpu_data(cpu)->threads_per_core == 1 &&
             cpu_data(cpu)->cores_per_socket == 1) {
-                cpu_set(cpu, per_cpu(cpu_sibling_map, cpu));
-                cpu_set(cpu, cpu_core_map[cpu]);
+                cpumask_set_cpu(cpu, &per_cpu(cpu_sibling_map, cpu));
+                cpumask_set_cpu(cpu, &cpu_core_map[cpu]);
                 return 0;
         }