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

Commit 49b92050 authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: use mm_cpumask() wrapper: m32r 



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>
Acked-by: Hirokazu Takata <takata@linux-m32r.org> (fixes)
parent 56f8ba83

arch/m32r/include/asm/mmu_context.h

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static inline void switch_mm(struct mm_struct *prev, 


	if (prev != next) {

#ifdef CONFIG_SMP

		cpu_set(cpu, next->cpu_vm_mask);

		cpumask_set_cpu(cpu, mm_cpumask(next));

#endif /* CONFIG_SMP */

		/* Set MPTB = next->pgd */

		*(volatile unsigned long *)MPTB = (unsigned long)next->pgd;
@@ -135,7 +135,7 @@ static inline void switch_mm(struct mm_struct *prev, 
	}

#ifdef CONFIG_SMP

	else

		if (!cpu_test_and_set(cpu, next->cpu_vm_mask))

		if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next)))

			activate_context(next);

#endif /* CONFIG_SMP */

}

arch/m32r/kernel/smp.c

+4 −4
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ void smp_flush_tlb_mm(struct mm_struct *mm) 
	preempt_disable();

	cpu_id = smp_processor_id();

	mmc = &mm->context[cpu_id];

	cpu_mask = mm->cpu_vm_mask;

	cpu_mask = *mm_cpumask(mm);

	cpu_clear(cpu_id, cpu_mask);



	if (*mmc != NO_CONTEXT) {
@@ -273,7 +273,7 @@ void smp_flush_tlb_mm(struct mm_struct *mm) 
		if (mm == current->mm)

			activate_context(mm);

		else

			cpu_clear(cpu_id, mm->cpu_vm_mask);

			cpumask_clear_cpu(cpu_id, mm_cpumask(mm));

		local_irq_restore(flags);

	}

	if (!cpus_empty(cpu_mask))
@@ -334,7 +334,7 @@ void smp_flush_tlb_page(struct vm_area_struct *vma, unsigned long va) 
	preempt_disable();

	cpu_id = smp_processor_id();

	mmc = &mm->context[cpu_id];

	cpu_mask = mm->cpu_vm_mask;

	cpu_mask = *mm_cpumask(mm);

	cpu_clear(cpu_id, cpu_mask);



#ifdef DEBUG_SMP
@@ -469,7 +469,7 @@ void smp_invalidate_interrupt(void) 
		if (flush_mm == current->active_mm)

			activate_context(flush_mm);

		else

			cpu_clear(cpu_id, flush_mm->cpu_vm_mask);

			cpumask_clear_cpu(cpu_id, mm_cpumask(flush_mm));

	} else {

		unsigned long va = flush_va;