---

yaml --- r: 169904 b: refs/heads/master c: a3a1de0 h: refs/heads/master v: v3
git-mirror · Nov 24, 2009 · e55713e · e55713e
1 parent 2ba3f49
commit e55713e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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);