diff options
| author |   Will Deacon <will.deacon@arm.com> | 2015-07-29 12:41:49 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2015-08-04 09:37:52 +0200 |
| commit | 7baa7aecdd2f009ddd00a4ad0690c6918bab5b01 (patch) | |
| tree | 79e6eece9fc2b8333b4976cb531c600ed969e845 | |
| parent | sched/fair: Clean up load average references (diff) | |
| download | wireguard-linux-7baa7aecdd2f009ddd00a4ad0690c6918bab5b01.tar.xz wireguard-linux-7baa7aecdd2f009ddd00a4ad0690c6918bab5b01.zip | |
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>
| -rw-r--r-- | arch/arm/include/asm/switch_to.h | 5 |
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) |