diff options
Diffstat (limited to 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index f7864ac2ecc1..29068ab2670a 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -91,6 +91,8 @@ static void __exit_signal(struct task_struct *tsk) | |||
91 | if (atomic_dec_and_test(&sig->count)) | 91 | if (atomic_dec_and_test(&sig->count)) |
92 | posix_cpu_timers_exit_group(tsk); | 92 | posix_cpu_timers_exit_group(tsk); |
93 | else { | 93 | else { |
94 | cputime_t utime, stime; | ||
95 | |||
94 | /* | 96 | /* |
95 | * If there is any task waiting for the group exit | 97 | * If there is any task waiting for the group exit |
96 | * then notify it: | 98 | * then notify it: |
@@ -110,8 +112,9 @@ static void __exit_signal(struct task_struct *tsk) | |||
110 | * We won't ever get here for the group leader, since it | 112 | * We won't ever get here for the group leader, since it |
111 | * will have been the last reference on the signal_struct. | 113 | * will have been the last reference on the signal_struct. |
112 | */ | 114 | */ |
113 | sig->utime = cputime_add(sig->utime, task_utime(tsk)); | 115 | task_times(tsk, &utime, &stime); |
114 | sig->stime = cputime_add(sig->stime, task_stime(tsk)); | 116 | sig->utime = cputime_add(sig->utime, utime); |
117 | sig->stime = cputime_add(sig->stime, stime); | ||
115 | sig->gtime = cputime_add(sig->gtime, task_gtime(tsk)); | 118 | sig->gtime = cputime_add(sig->gtime, task_gtime(tsk)); |
116 | sig->min_flt += tsk->min_flt; | 119 | sig->min_flt += tsk->min_flt; |
117 | sig->maj_flt += tsk->maj_flt; | 120 | sig->maj_flt += tsk->maj_flt; |