From d61d3ae2dc968e139942f95615a96bba672b2c6a Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Tue, 17 May 2011 16:21:10 -0700 Subject: [PATCH] --- yaml --- r: 252684 b: refs/heads/master c: 1e876231785d82443a5ac8b6c660e9f51bc5dede h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f80385247b76..b055a34baffb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6aa8f85f16379d42c147b22b59e33b67f9ff466 +refs/heads/master: 1e876231785d82443a5ac8b6c660e9f51bc5dede diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index e32a9b70ee9c..433491c2dc8f 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -1076,8 +1076,6 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags) se->on_rq = 0; update_cfs_load(cfs_rq, 0); account_entity_dequeue(cfs_rq, se); - update_min_vruntime(cfs_rq); - update_cfs_shares(cfs_rq); /* * Normalize the entity after updating the min_vruntime because the @@ -1086,6 +1084,9 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags) */ if (!(flags & DEQUEUE_SLEEP)) se->vruntime -= cfs_rq->min_vruntime; + + update_min_vruntime(cfs_rq); + update_cfs_shares(cfs_rq); } /*