diff --git a/[refs] b/[refs] index a1460e5a93ff..905ebb8a7ec4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1158ddb55416855fd17abe3214298f736f00426a +refs/heads/master: 16c8f1c72ece3871a6c93003cd888fc2d003a7eb diff --git a/trunk/kernel/sched/fair.c b/trunk/kernel/sched/fair.c index a7a19ffc3b7e..8dbee9f4ceb2 100644 --- a/trunk/kernel/sched/fair.c +++ b/trunk/kernel/sched/fair.c @@ -1680,9 +1680,7 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial) } /* ensure we never gain time by being placed backwards. */ - vruntime = max_vruntime(se->vruntime, vruntime); - - se->vruntime = vruntime; + se->vruntime = max_vruntime(se->vruntime, vruntime); } static void check_enqueue_throttle(struct cfs_rq *cfs_rq);