cpumask: use mm_cpumask() wrapper: mips
PATCH 10/13 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 <[email protected]>
--- arch/mips/include/asm/mmu_context.h | 10 +++++----- arch/mips/mm/c-octeon.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
arch/mips/include/asm/mmu_context.h +5 -5
@@ -177,8 +177,8 @@ static inline void switch_mm(struct mm_s* 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); }
@@ -234,8 +234,8 @@ activate_mm(struct mm_struct *prev, struTLBMISS_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); }
@@ -257,7 +257,7 @@ drop_mmu_context(struct mm_struct *mm, ulocal_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 */
arch/mips/mm/c-octeon.c +1 -1
@@ -78,7 +78,7 @@ static void octeon_flush_icache_all_core* cores it has been used on */ if (vma) - mask = vma->vm_mm->cpu_vm_mask; + mask = *mm_cpumask (vma->vm_mm);else mask = cpu_online_map;cpu_clear (cpu, mask);