Merge branch 'sched/urgent' into sched/core

[safe/jmp/linux-2.6] / arch / x86 / kernel / process_64.c

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