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

[Tim Blechmann <tim@klingt.org>]

[-- Attachment #1: Type: text/plain, Size: 393 bytes --]


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 <tim@klingt.org>
---
  arch/x86/kernel/process_64.c |    5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)



[-- Attachment #2: 0001-Revert-sched-x86-Optimize-branch-hint-in-__switch_to.patch --]
[-- Type: text/x-patch, Size: 595 bytes --]

diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 93c501d..eb62cbc 100644
--- 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);