---

yaml --- r: 169916 b: refs/heads/master c: be8147e h: refs/heads/master v: v3
git-mirror · Dec 2, 2009 · bd0a201 · bd0a201
1 parent c426093
commit bd0a201
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdddd2963c0264c56f18043f6fa829d3c1d3d1c0
+refs/heads/master: be8147e68625a1adb111acfd6b98a492be4b74d0
diff --git a/trunk/arch/x86/kernel/process_64.c b/trunk/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);