aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/array.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c
index ca61a88aed66..2571da43c736 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -506,7 +506,6 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
506 506
507 /* add up live thread stats at the group level */ 507 /* add up live thread stats at the group level */
508 if (whole) { 508 if (whole) {
509 struct task_cputime cputime;
510 struct task_struct *t = task; 509 struct task_struct *t = task;
511 do { 510 do {
512 min_flt += t->min_flt; 511 min_flt += t->min_flt;
@@ -517,9 +516,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
517 516
518 min_flt += sig->min_flt; 517 min_flt += sig->min_flt;
519 maj_flt += sig->maj_flt; 518 maj_flt += sig->maj_flt;
520 thread_group_cputime(task, &cputime); 519 thread_group_times(task, &utime, &stime);
521 utime = cputime.utime;
522 stime = cputime.stime;
523 gtime = cputime_add(gtime, sig->gtime); 520 gtime = cputime_add(gtime, sig->gtime);
524 } 521 }
525 522