cpumask: use mm_cpumask() wrapper: mips

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>

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/mips/include/asm/mmu_context.h b/arch/mips/include/asm/mmu_context.h
index d3bea88d8744..d9743536a621 100644
--- a/arch/mips/include/asm/mmu_context.h
+++ b/arch/mips/include/asm/mmu_context.h
@@ -178,8 +178,8 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
          * Mark current->active_mm as not "active" anymore.
          * We don't want to mislead possible IPI tlb flush routines.
          */
-        cpu_clear(cpu, prev->cpu_vm_mask);
-        cpu_set(cpu, next->cpu_vm_mask);
+        cpumask_clear_cpu(cpu, mm_cpumask(prev));
+        cpumask_set_cpu(cpu, mm_cpumask(next));
 
         local_irq_restore(flags);
 }
@@ -235,8 +235,8 @@ activate_mm(struct mm_struct *prev, struct mm_struct *next)
         TLBMISS_HANDLER_SETUP_PGD(next->pgd);
 
         /* mark mmu ownership change */
-        cpu_clear(cpu, prev->cpu_vm_mask);
-        cpu_set(cpu, next->cpu_vm_mask);
+        cpumask_clear_cpu(cpu, mm_cpumask(prev));
+        cpumask_set_cpu(cpu, mm_cpumask(next));
 
         local_irq_restore(flags);
 }
@@ -258,7 +258,7 @@ drop_mmu_context(struct mm_struct *mm, unsigned cpu)
 
         local_irq_save(flags);
 
-        if (cpu_isset(cpu, mm->cpu_vm_mask))  {
+        if (cpumask_test_cpu(cpu, mm_cpumask(mm)))  {
                 get_new_mmu_context(mm, cpu);
 #ifdef CONFIG_MIPS_MT_SMTC
                 /* See comments for similar code above */