cpumask: Use accessors for cpu_*_mask: powerpc

Use the accessors rather than frobbing bits directly (the new versions
are const).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Mike Travis <travis@sgi.com>

4 files changed, 13 insertions, 13 deletions

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 1d5570a1e456..9837d9153c4b 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -432,9 +432,9 @@ void __init smp_setup_cpu_maps(void)
                 for (j = 0; j < nthreads && cpu < NR_CPUS; j++) {
                         DBG("    thread %d -> cpu %d (hard id %d)\n",
                             j, cpu, intserv[j]);
-                        cpu_set(cpu, cpu_present_map);
+                        set_cpu_present(cpu, true);
                         set_hard_smp_processor_id(cpu, intserv[j]);
-                        cpu_set(cpu, cpu_possible_map);
+                        set_cpu_possible(cpu, true);
                         cpu++;
                 }
         }
@@ -480,7 +480,7 @@ void __init smp_setup_cpu_maps(void)
                                maxcpus);
 
                 for (cpu = 0; cpu < maxcpus; cpu++)
-                        cpu_set(cpu, cpu_possible_map);
+                        set_cpu_possible(cpu, true);
         out:
                 of_node_put(dn);
         }
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 7f68ceb3bdb8..9b86a74d2815 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -287,7 +287,7 @@ void __devinit smp_prepare_boot_cpu(void)
 {
         BUG_ON(smp_processor_id() != boot_cpuid);
 
-        cpu_set(boot_cpuid, cpu_online_map);
+        set_cpu_online(boot_cpuid, true);
         cpu_set(boot_cpuid, per_cpu(cpu_sibling_map, boot_cpuid));
         cpu_set(boot_cpuid, per_cpu(cpu_core_map, boot_cpuid));
 #ifdef CONFIG_PPC64
@@ -307,7 +307,7 @@ int generic_cpu_disable(void)
         if (cpu == boot_cpuid)
                 return -EBUSY;
 
-        cpu_clear(cpu, cpu_online_map);
+        set_cpu_online(cpu, false);
 #ifdef CONFIG_PPC64
         vdso_data->processorCount--;
         fixup_irqs(cpu_online_map);
@@ -361,7 +361,7 @@ void generic_mach_cpu_die(void)
         smp_wmb();
         while (__get_cpu_var(cpu_state) != CPU_UP_PREPARE)
                 cpu_relax();
-        cpu_set(cpu, cpu_online_map);
+        set_cpu_online(cpu, true);
         local_irq_enable();
 }
 #endif
@@ -508,7 +508,7 @@ int __devinit start_secondary(void *unused)
 
         ipi_call_lock();
         notify_cpu_starting(cpu);
-        cpu_set(cpu, cpu_online_map);
+        set_cpu_online(cpu, true);
         /* Update sibling maps */
         base = cpu_first_thread_in_core(cpu);
         for (i = 0; i < threads_per_core; i++) {
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 937a38e73178..b40c22d697f0 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -320,7 +320,7 @@ static int __init smp_psurge_probe(void)
         if (ncpus > NR_CPUS)
                 ncpus = NR_CPUS;
         for (i = 1; i < ncpus ; ++i)
-                cpu_set(i, cpu_present_map);
+                set_cpu_present(i, true);
 
         if (ppc_md.progress) ppc_md.progress("smp_psurge_probe - done", 0x352);
 
@@ -867,7 +867,7 @@ static void __devinit smp_core99_setup_cpu(int cpu_nr)
 
 int smp_core99_cpu_disable(void)
 {
-        cpu_clear(smp_processor_id(), cpu_online_map);
+        set_cpu_online(smp_processor_id(), false);
 
         /* XXX reset cpu affinity here */
         mpic_cpu_set_priority(0xf);
@@ -952,7 +952,7 @@ void __init pmac_setup_smp(void)
                 int cpu;
 
                 for (cpu = 1; cpu < 4 && cpu < NR_CPUS; ++cpu)
-                        cpu_set(cpu, cpu_possible_map);
+                        set_cpu_possible(cpu, true);
                 smp_ops = &psurge_smp_ops;
         }
 #endif /* CONFIG_PPC32 */
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index a20ead87153d..ebff6d9a4e39 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -94,7 +94,7 @@ static int pseries_cpu_disable(void)
 {
         int cpu = smp_processor_id();
 
-        cpu_clear(cpu, cpu_online_map);
+        set_cpu_online(cpu, false);
         vdso_data->processorCount--;
 
         /*fix boot_cpuid here*/
@@ -185,7 +185,7 @@ static int pseries_add_processor(struct device_node *np)
 
         for_each_cpu_mask(cpu, tmp) {
                 BUG_ON(cpu_isset(cpu, cpu_present_map));
-                cpu_set(cpu, cpu_present_map);
+                set_cpu_present(cpu, true);
                 set_hard_smp_processor_id(cpu, *intserv++);
         }
         err = 0;
@@ -217,7 +217,7 @@ static void pseries_remove_processor(struct device_node *np)
                         if (get_hard_smp_processor_id(cpu) != intserv[i])
                                 continue;
                         BUG_ON(cpu_online(cpu));
-                        cpu_clear(cpu, cpu_present_map);
+                        set_cpu_present(cpu, false);
                         set_hard_smp_processor_id(cpu, -1);
                         break;
                 }