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

Commit 14d0334c authored by Pavel Tatashin's avatar Pavel Tatashin Committed by David S. Miller
Browse files

sparc64: combine activate_mm and switch_mm 



The only difference between these two functions is that in activate_mm we
unconditionally flush context. However, there is no need to keep this
difference after fixing a bug where cpumask was not reset on a wrap. So, in
this patch we combine these.

Signed-off-by: default avatarPavel Tatashin <pasha.tatashin@oracle.com>
Reviewed-by: default avatarBob Picco <bob.picco@oracle.com>
Reviewed-by: default avatarSteven Sistare <steven.sistare@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 58897485

arch/sparc/include/asm/mmu_context_64.h

+1 −20
Original line number Diff line number Diff line
@@ -133,26 +133,7 @@ static inline void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm, str 
}



#define deactivate_mm(tsk,mm)	do { } while (0)



/* Activate a new MM instance for the current task. */

static inline void activate_mm(struct mm_struct *active_mm, struct mm_struct *mm)

{

	unsigned long flags;

	int cpu;



	spin_lock_irqsave(&mm->context.lock, flags);

	if (!CTX_VALID(mm->context))

		get_new_mmu_context(mm);

	cpu = smp_processor_id();

	if (!cpumask_test_cpu(cpu, mm_cpumask(mm)))

		cpumask_set_cpu(cpu, mm_cpumask(mm));



	load_secondary_context(mm);

	__flush_tlb_mm(CTX_HWBITS(mm->context), SECONDARY_CONTEXT);

	tsb_context_switch(mm);

	spin_unlock_irqrestore(&mm->context.lock, flags);

}



#define activate_mm(active_mm, mm) switch_mm(active_mm, mm, NULL)

#endif /* !(__ASSEMBLY__) */



#endif /* !(__SPARC64_MMU_CONTEXT_H) */