diff --git a/[refs] b/[refs] index 6b16ee358ffa..862bc4d37aa4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd9b86d37a600488dbd80fe60cca46b822bff1cd +refs/heads/master: e614b3332a4f3f264a26da28e5a1f4cc3aea3974 diff --git a/trunk/kernel/sched/cputime.c b/trunk/kernel/sched/cputime.c index ed12cbb135f4..e93cca92f38b 100644 --- a/trunk/kernel/sched/cputime.c +++ b/trunk/kernel/sched/cputime.c @@ -310,7 +310,7 @@ void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times) t = tsk; do { - task_cputime(tsk, &utime, &stime); + task_cputime(t, &utime, &stime); times->utime += utime; times->stime += stime; times->sum_exec_runtime += task_sched_runtime(t);