commit 2830cf8c90f37526d401f1999250312df970bfa3
author Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com> Mon Oct 15 17:00:12 2007 +0200
committer Ingo Molnar <mingo@elte.hu> Mon Oct 15 17:00:12 2007 +0200
tree 9f40ff1f624cba21be3db086d3d87716e0b1f66f
parent 2d72376b3af1e7d4d4515ebfd0f4383f2e92c343

sched: group scheduler SMP migration fix

group scheduler SMP migration fix: use task_cfs_rq(p) to get
to the relevant fair-scheduling runqueue of a task, rq->cfs
is not the right one.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

kernel/sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index ba9fa6c..e1657e0 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1040,6 +1040,8 @@
 {
 	int old_cpu = task_cpu(p);
 	struct rq *old_rq = cpu_rq(old_cpu), *new_rq = cpu_rq(new_cpu);
+	struct cfs_rq *old_cfsrq = task_cfs_rq(p),
+		      *new_cfsrq = cpu_cfs_rq(old_cfsrq, new_cpu);
 	u64 clock_offset;
 
 	clock_offset = old_rq->clock - new_rq->clock;
@@ -1052,7 +1054,8 @@
 	if (p->se.block_start)
 		p->se.block_start -= clock_offset;
 #endif
-	p->se.vruntime -= old_rq->cfs.min_vruntime - new_rq->cfs.min_vruntime;
+	p->se.vruntime -= old_cfsrq->min_vruntime -
+					 new_cfsrq->min_vruntime;
 
 	__set_task_cpu(p, new_cpu);
 }