sched: remove condition from set_task_cpu()

remove condition from set_task_cpu(). Now that ->vruntime
is not global anymore, it should (and does) work fine without
it too.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>

diff --git a/kernel/sched.c b/kernel/sched.c
index 213294fdcd0f3ce42da7d32f4baf6085397d0f4a..c779bf9d3552123b15d82360895883d502e9205b 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1052,9 +1052,7 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
        if (p->se.block_start)
                p->se.block_start -= clock_offset;
 #endif
-       if (likely(new_rq->cfs.min_vruntime))
-               p->se.vruntime -= old_rq->cfs.min_vruntime -
-                                               new_rq->cfs.min_vruntime;
+       p->se.vruntime -= old_rq->cfs.min_vruntime - new_rq->cfs.min_vruntime;
 
        __set_task_cpu(p, new_cpu);
 }