powerpc: Convert old cpumask API into new one

Adapt new API.

Almost change is trivial. Most important change is the below line
because we plan to change task->cpus_allowed implementation.

-       ctx->cpus_allowed = current->cpus_allowed;

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 909804aaeebb..91309c5c00d7 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -334,7 +334,7 @@ static void release_output_lock(void)
 
 int cpus_are_in_xmon(void)
 {
-        return !cpus_empty(cpus_in_xmon);
+        return !cpumask_empty(&cpus_in_xmon);
 }
 #endif
 
@@ -373,7 +373,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
 
 #ifdef CONFIG_SMP
         cpu = smp_processor_id();
-        if (cpu_isset(cpu, cpus_in_xmon)) {
+        if (cpumask_test_cpu(cpu, &cpus_in_xmon)) {
                 get_output_lock();
                 excprint(regs);
                 printf("cpu 0x%x: Exception %lx %s in xmon, "
@@ -396,7 +396,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
         }
 
         xmon_fault_jmp[cpu] = recurse_jmp;
-        cpu_set(cpu, cpus_in_xmon);
+        cpumask_set_cpu(cpu, &cpus_in_xmon);
 
         bp = NULL;
         if ((regs->msr & (MSR_IR|MSR_PR|MSR_64BIT)) == (MSR_IR|MSR_64BIT))
@@ -440,7 +440,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
                         smp_send_debugger_break(MSG_ALL_BUT_SELF);
                         /* wait for other cpus to come in */
                         for (timeout = 100000000; timeout != 0; --timeout) {
-                                if (cpus_weight(cpus_in_xmon) >= ncpus)
+                                if (cpumask_weight(&cpus_in_xmon) >= ncpus)
                                         break;
                                 barrier();
                         }
@@ -484,7 +484,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
                 }
         }
  leave:
-        cpu_clear(cpu, cpus_in_xmon);
+        cpumask_clear_cpu(cpu, &cpus_in_xmon);
         xmon_fault_jmp[cpu] = NULL;
 #else
         /* UP is simple... */
@@ -630,7 +630,7 @@ static int xmon_iabr_match(struct pt_regs *regs)
 static int xmon_ipi(struct pt_regs *regs)
 {
 #ifdef CONFIG_SMP
-        if (in_xmon && !cpu_isset(smp_processor_id(), cpus_in_xmon))
+        if (in_xmon && !cpumask_test_cpu(smp_processor_id(), &cpus_in_xmon))
                 xmon_core(regs, 1);
 #endif
         return 0;
@@ -976,7 +976,7 @@ static int cpu_cmd(void)
                 printf("cpus stopped:");
                 count = 0;
                 for (cpu = 0; cpu < NR_CPUS; ++cpu) {
-                        if (cpu_isset(cpu, cpus_in_xmon)) {
+                        if (cpumask_test_cpu(cpu, &cpus_in_xmon)) {
                                 if (count == 0)
                                         printf(" %x", cpu);
                                 ++count;
@@ -992,7 +992,7 @@ static int cpu_cmd(void)
                 return 0;
         }
         /* try to switch to cpu specified */
-        if (!cpu_isset(cpu, cpus_in_xmon)) {
+        if (!cpumask_test_cpu(cpu, &cpus_in_xmon)) {
                 printf("cpu 0x%x isn't in xmon\n", cpu);
                 return 0;
         }