sched, arm: Remove finish_arch_switch()
authorWill Deacon <will.deacon@arm.com>
Wed, 29 Jul 2015 11:41:49 +0000 (12:41 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 4 Aug 2015 07:37:52 +0000 (09:37 +0200)
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>
arch/arm/include/asm/switch_to.h

index c99e259469f7de9185f394dbb3c4453ff2f0f50f..12ebfcc1d539151bd8365594befaa2e9814fb3a9 100644 (file)
@@ -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)