From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 15 Oct 2007 15:00:11 +0000 (+0200)
Subject: sched: remove condition from set_task_cpu()
X-Git-Tag: v2.6.24-rc1~1289^2~74
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=785c29ef9573d98b31493c9a68c3589449082108;p=linux.git

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 213294fdcd0f..c779bf9d3552 100644
--- 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);
 }