diff options
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r-- | fs/proc/array.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 71c9be59c9c2..933953c4e407 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c | |||
@@ -395,20 +395,20 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, | |||
395 | 395 | ||
396 | /* add up live thread stats at the group level */ | 396 | /* add up live thread stats at the group level */ |
397 | if (whole) { | 397 | if (whole) { |
398 | struct task_cputime cputime; | ||
398 | struct task_struct *t = task; | 399 | struct task_struct *t = task; |
399 | do { | 400 | do { |
400 | min_flt += t->min_flt; | 401 | min_flt += t->min_flt; |
401 | maj_flt += t->maj_flt; | 402 | maj_flt += t->maj_flt; |
402 | utime = cputime_add(utime, task_utime(t)); | ||
403 | stime = cputime_add(stime, task_stime(t)); | ||
404 | gtime = cputime_add(gtime, task_gtime(t)); | 403 | gtime = cputime_add(gtime, task_gtime(t)); |
405 | t = next_thread(t); | 404 | t = next_thread(t); |
406 | } while (t != task); | 405 | } while (t != task); |
407 | 406 | ||
408 | min_flt += sig->min_flt; | 407 | min_flt += sig->min_flt; |
409 | maj_flt += sig->maj_flt; | 408 | maj_flt += sig->maj_flt; |
410 | utime = cputime_add(utime, sig->utime); | 409 | thread_group_cputime(task, &cputime); |
411 | stime = cputime_add(stime, sig->stime); | 410 | utime = cputime.utime; |
411 | stime = cputime.stime; | ||
412 | gtime = cputime_add(gtime, sig->gtime); | 412 | gtime = cputime_add(gtime, sig->gtime); |
413 | } | 413 | } |
414 | 414 | ||