diff --git a/[refs] b/[refs] index 47a491de8856..17ee2ba5feb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86d9560cb6bd85986e98b4c63705daec94406bd4 +refs/heads/master: 7a62eabc4d60980eb39fff659f168d903b55c6d7 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 895fef74d99a..ce79eb0f0660 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -301,7 +301,7 @@ __update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr, schedstat_set(curr->exec_max, max((u64)delta_exec, curr->exec_max)); curr->sum_exec_runtime += delta_exec; - cfs_rq->exec_clock += delta_exec; + schedstat_add(cfs_rq, exec_clock, delta_exec); delta_exec_weighted = delta_exec; if (unlikely(curr->load.weight != NICE_0_LOAD)) { delta_exec_weighted = calc_delta_fair(delta_exec_weighted,