Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55b8cab4 authored by Rusty Russell's avatar Rusty Russell
Browse files

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: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 7ce1df49

arch/mips/include/asm/mmu_context.h

+5 −5
Original line number Diff line number Diff line
@@ -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 */

arch/mips/mm/c-octeon.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static void octeon_flush_icache_all_cores(struct vm_area_struct *vma) 
	 * 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);