summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/switch_to.h
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2015-07-31 12:28:54 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-07-31 19:58:30 +0200
commit9ac87c5a0b19417f925dc61cac7198d872159a2c (patch)
tree89f6b4a8bae2a8d494928fe5204bd7ac4d24e7ac /arch/arm/include/asm/switch_to.h
parentARM: 8392/3: smp: Only expose /sys/.../cpuX/online if hotpluggable (diff)
downloadlinux-9ac87c5a0b19417f925dc61cac7198d872159a2c.tar.xz
linux-9ac87c5a0b19417f925dc61cac7198d872159a2c.zip
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: Will Deacon <will.deacon@arm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to '')
-rw-r--r--arch/arm/include/asm/switch_to.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/include/asm/switch_to.h b/arch/arm/include/asm/switch_to.h
index c99e259469f7..12ebfcc1d539 100644
--- 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(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)