From: Will Deacon <[email protected]>
Fold finish_arch_switch() into switch_to().
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
---
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)
* Peter Zijlstra <[email protected]> wrote:
> From: Will Deacon <[email protected]>
>
> Fold finish_arch_switch() into switch_to().
>
> Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Will, can I add your:
Signed-off-by: Will Deacon <[email protected]>
?
Thanks,
Ingo
On Tue, Aug 04, 2015 at 09:39:43AM +0200, Ingo Molnar wrote:
>
> * Peter Zijlstra <[email protected]> wrote:
>
> > From: Will Deacon <[email protected]>
> >
> > Fold finish_arch_switch() into switch_to().
> >
> > Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
>
> Will, can I add your:
>
> Signed-off-by: Will Deacon <[email protected]>
I've already merged this patch as Will had submitted it to me for merging.
Peter's S-o-b should be an acked-by though in that case...
--
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.
On Tue, Aug 04, 2015 at 09:26:22AM +0100, Russell King - ARM Linux wrote:
> On Tue, Aug 04, 2015 at 09:39:43AM +0200, Ingo Molnar wrote:
> >
> > * Peter Zijlstra <[email protected]> wrote:
> >
> > > From: Will Deacon <[email protected]>
> > >
> > > Fold finish_arch_switch() into switch_to().
> > >
> > > Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
> >
> > Will, can I add your:
> >
> > Signed-off-by: Will Deacon <[email protected]>
>
> I've already merged this patch as Will had submitted it to me for merging.
Yup. Peter said he would pick up what's left after the merge window, so
arch maintainers can pick up the patches now for 4.3 (I think Ralf had
picked up the mips part already).
> Peter's S-o-b should be an acked-by though in that case...
I guess, although he turned my diff into a patch (i.e. wrote the commit
message) and posted it, so I just left it there. Not fussed either way.
Will