cpumask: use mm_cpumask() wrapper: sh

Makes code futureproof against the impending change to mm->cpu_vm_mask.

It's also a chance to use the new cpumask_ ops which take a pointer
(the older ones are deprecated, but there's no hurry for arch code).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/sh/include/asm/mmu_context.h b/arch/sh/include/asm/mmu_context.h
index 2a9c55f1a83f..2c987f567763 100644
--- a/arch/sh/include/asm/mmu_context.h
+++ b/arch/sh/include/asm/mmu_context.h
@@ -122,11 +122,11 @@ static inline void switch_mm(struct mm_struct *prev,
         unsigned int cpu = smp_processor_id();
 
         if (likely(prev != next)) {
-                cpu_set(cpu, next->cpu_vm_mask);
+                cpumask_set_cpu(cpu, mm_cpumask(next));
                 set_TTB(next->pgd);
                 activate_context(next, cpu);
         } else
-                if (!cpu_test_and_set(cpu, next->cpu_vm_mask))
+                if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next)))
                         activate_context(next, cpu);
 }
 #else