diff --git a/[refs] b/[refs] index 5fd7801a0b2c..a1626814edcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bc912b71b6f33b041cfde93ca3f019cbaa852bc +refs/heads/master: e17036dac189dd034c092a91df56aa740db7146d diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index cdebd8089cb0..16b419bb8b0a 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -283,7 +283,7 @@ static void update_min_vruntime(struct cfs_rq *cfs_rq) struct sched_entity, run_node); - if (vruntime == cfs_rq->min_vruntime) + if (!cfs_rq->curr) vruntime = se->vruntime; else vruntime = min_vruntime(vruntime, se->vruntime);