From: Will Deacon <will.dea...@arm.com>

Fold finish_arch_switch() into switch_to().

Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org>
---
 arch/arm/include/asm/switch_to.h |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- a/arch/arm/include/asm/switch_to.h
+++ b/arch/arm/include/asm/switch_to.h
@@ -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(s
 
 #define switch_to(prev,next,last)                                      \
 do {                                                                   \
+       __complete_pending_tlbi();                                      \
        last = __switch_to(prev,task_thread_info(prev), 
task_thread_info(next));        \
 } while (0)
 


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to