sched: fix normalized sleeper
Normalized sleeper uses calc_delta*() which requires that the rq load is already updated, so move account_entity_enqueue() before place_entity() Tested-by: Frans Pop <elendil@planet.nl> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
5717922a1b
commit
a992241de6
|
@ -682,6 +682,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int wakeup)
|
||||||
* Update run-time statistics of the 'current'.
|
* Update run-time statistics of the 'current'.
|
||||||
*/
|
*/
|
||||||
update_curr(cfs_rq);
|
update_curr(cfs_rq);
|
||||||
|
account_entity_enqueue(cfs_rq, se);
|
||||||
|
|
||||||
if (wakeup) {
|
if (wakeup) {
|
||||||
place_entity(cfs_rq, se, 0);
|
place_entity(cfs_rq, se, 0);
|
||||||
|
@ -692,7 +693,6 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int wakeup)
|
||||||
check_spread(cfs_rq, se);
|
check_spread(cfs_rq, se);
|
||||||
if (se != cfs_rq->curr)
|
if (se != cfs_rq->curr)
|
||||||
__enqueue_entity(cfs_rq, se);
|
__enqueue_entity(cfs_rq, se);
|
||||||
account_entity_enqueue(cfs_rq, se);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void update_avg(u64 *avg, u64 sample)
|
static void update_avg(u64 *avg, u64 sample)
|
||||||
|
|
Loading…
Reference in New Issue