From 799c02eb083523942459ff8e8877e1a425cbb438 Mon Sep 17 00:00:00 2001 From: Srivatsa Vaddagiri Date: Mon, 15 Oct 2007 17:00:12 +0200 Subject: [PATCH] --- yaml --- r: 69081 b: refs/heads/master c: 2830cf8c90f37526d401f1999250312df970bfa3 h: refs/heads/master i: 69079: 683cb9e243322dab52c6e2db8878c0ba3029013b v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 82dde86412db..5c268d9e721c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d72376b3af1e7d4d4515ebfd0f4383f2e92c343 +refs/heads/master: 2830cf8c90f37526d401f1999250312df970bfa3 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index ba9fa6c0ab65..e1657e0c86d0 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -1040,6 +1040,8 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu) { 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 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu) 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); }