Commit 7baa7aec authored Jul 29, 2015 by Will Deacon Committed by Ingo Molnar Aug 04, 2015

sched, arm: Remove finish_arch_switch()

Fold finish_arch_switch() into switch_to().

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Cc: linux@arm.linux.org.uk
[ Fixed up the SOB chain. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 7ea241af

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)