Revert "sched, x86: Optimize branch hint in __switch_to()"

This reverts commit a3a1de0c34de6f5f8332cd6151c46af7813c0fcb.

Commit 8ec6993d9f7d961014af970ded57542961fe9ad9 cleared the es
and ds selectors, so the original branch hints are correct now.
Therefore the branch hint doesn't need to be removed.

Signed-off-by: Tim Blechmann <[email protected]>
LKML-Reference: <4B16503A.8030508@klingt.org>
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 93c501dc24961ed646de11a06405bb698bdb0b8a..eb62cbcaa490ad553ef5d70b6751a2288d25089e 100644 (file)
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -406,10 +406,11 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
         * This won't pick up thread selector changes, but I guess that is ok.
         */
        savesegment(es, prev->es);
-       if (next->es | prev->es)
+       if (unlikely(next->es | prev->es))
                loadsegment(es, next->es);
+
        savesegment(ds, prev->ds);
-       if (next->ds | prev->ds)
+       if (unlikely(next->ds | prev->ds))
                loadsegment(ds, next->ds);