diff --git a/[refs] b/[refs] index 4efd798556b4..9ed1091d89d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f2aa307c4d26b4ed6509d0a79e8254c9e07e921 +refs/heads/master: e1f8450854d69f0291882804406ea1bab3ca44b4 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 26fadb44250c..aa7f84121016 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -545,14 +545,13 @@ update_stats_wait_end(struct cfs_rq *cfs_rq, struct sched_entity *se) schedstat_set(se->wait_count, se->wait_count + 1); schedstat_set(se->wait_sum, se->wait_sum + rq_of(cfs_rq)->clock - se->wait_start); - schedstat_set(se->wait_start, 0); - #ifdef CONFIG_SCHEDSTATS if (entity_is_task(se)) { trace_sched_stat_wait(task_of(se), rq_of(cfs_rq)->clock - se->wait_start); } #endif + schedstat_set(se->wait_start, 0); } static inline void