3 files changed, 4 insertions, 4 deletions

diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mmu_context.h
index 28ec870655a..fc7edd6f41b 100644
--- a/arch/s390/include/asm/mmu_context.h
+++ b/arch/s390/include/asm/mmu_context.h
@@ -74,7 +74,7 @@ static inline void update_mm(struct mm_struct *mm, struct task_struct *tsk)
 static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
                              struct task_struct *tsk)
 {
-        cpu_set(smp_processor_id(), next->cpu_vm_mask);
+        cpumask_set_cpu(smp_processor_id(), mm_cpumask(next));
         update_mm(next, tsk);
 }
 
diff --git a/arch/s390/include/asm/tlbflush.h b/arch/s390/include/asm/tlbflush.h
index d60394b9745..304cffa623e 100644
--- a/arch/s390/include/asm/tlbflush.h
+++ b/arch/s390/include/asm/tlbflush.h
@@ -51,7 +51,7 @@ static inline void __tlb_flush_full(struct mm_struct *mm)
          * If the process only ran on the local cpu, do a local flush.
          */
         local_cpumask = cpumask_of_cpu(smp_processor_id());
-        if (cpus_equal(mm->cpu_vm_mask, local_cpumask))
+        if (cpumask_equal(mm_cpumask(mm), &local_cpumask))
                 __tlb_flush_local();
         else
                 __tlb_flush_global();
@@ -73,7 +73,7 @@ static inline void __tlb_flush_idte(unsigned long asce)
 
 static inline void __tlb_flush_mm(struct mm_struct * mm)
 {
-        if (unlikely(cpus_empty(mm->cpu_vm_mask)))
+        if (unlikely(cpumask_empty(mm_cpumask(mm))))
                 return;
         /*
          * If the machine has IDTE we prefer to do a per mm flush
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 9bf86125f6f..be6c1cf4ad5 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -296,7 +296,7 @@ int s390_enable_sie(void)
         tsk->mm = tsk->active_mm = mm;
         preempt_disable();
         update_mm(mm, tsk);
-        cpu_set(smp_processor_id(), mm->cpu_vm_mask);
+        cpumask_set_cpu(smp_processor_id(), mm_cpumask(mm));
         preempt_enable();
         task_unlock(tsk);
         mmput(old_mm);