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

Commit 005f8eee authored by Rusty Russell's avatar Rusty Russell Committed by Martin Schwidefsky
Browse files

[S390] cpumask: use mm_cpumask() wrapper 



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>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent def6cfb7

arch/s390/include/asm/mmu_context.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

arch/s390/include/asm/tlbflush.h

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/s390/mm/pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -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);