From e55713e64ef068ee55847490b4f3f8640de51975 Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Tue, 24 Nov 2009 11:55:15 +0100
Subject: [PATCH] --- yaml --- r: 169904 b: refs/heads/master c:
 a3a1de0c34de6f5f8332cd6151c46af7813c0fcb h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/process_64.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ed3b0a6c5be4..1ab719a22234 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 710390d90f143a9ebb87a475215140f426792efd
+refs/heads/master: a3a1de0c34de6f5f8332cd6151c46af7813c0fcb
diff --git a/trunk/arch/x86/kernel/process_64.c b/trunk/arch/x86/kernel/process_64.c
index ad535b683170..d9db1049e86f 100644
--- a/trunk/arch/x86/kernel/process_64.c
+++ b/trunk/arch/x86/kernel/process_64.c
@@ -406,11 +406,10 @@ __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 (unlikely(next->es | prev->es))
+	if (next->es | prev->es)
 		loadsegment(es, next->es);
-
 	savesegment(ds, prev->ds);
-	if (unlikely(next->ds | prev->ds))
+	if (next->ds | prev->ds)
 		loadsegment(ds, next->ds);