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

Commit 9ac87c5a authored by Will Deacon's avatar Will Deacon Committed by Russell King
Browse files

ARM: 8407/1: switch_to: Remove finish_arch_switch 



Fold finish_arch_switch() into switch_to(), in preparation for the
removal of the finish_arch_switch call from core sched code.

Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 787047ee

arch/arm/include/asm/switch_to.h

+4 −1
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ 
 * CPU.

 */

#if defined(CONFIG_PREEMPT) && defined(CONFIG_SMP) && defined(CONFIG_CPU_V7)

#define finish_arch_switch(prev)	dsb(ish)

#define __complete_pending_tlbi()	dsb(ish)

#else

#define __complete_pending_tlbi()

#endif



/*
@@ -22,6 +24,7 @@ extern struct task_struct *__switch_to(struct task_struct *, struct thread_info 


#define switch_to(prev,next,last)					\

do {									\

	__complete_pending_tlbi();					\

	last = __switch_to(prev,task_thread_info(prev), task_thread_info(next));	\

} while (0)