aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/signal.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index bf40ecc87b26..105217da5c82 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1341,6 +1341,7 @@ int do_notify_parent(struct task_struct *tsk, int sig)
1341 struct siginfo info; 1341 struct siginfo info;
1342 unsigned long flags; 1342 unsigned long flags;
1343 struct sighand_struct *psig; 1343 struct sighand_struct *psig;
1344 struct task_cputime cputime;
1344 int ret = sig; 1345 int ret = sig;
1345 1346
1346 BUG_ON(sig == -1); 1347 BUG_ON(sig == -1);
@@ -1371,10 +1372,9 @@ int do_notify_parent(struct task_struct *tsk, int sig)
1371 1372
1372 info.si_uid = tsk->uid; 1373 info.si_uid = tsk->uid;
1373 1374
1374 info.si_utime = cputime_to_clock_t(cputime_add(tsk->utime, 1375 thread_group_cputime(tsk, &cputime);
1375 tsk->signal->utime)); 1376 info.si_utime = cputime_to_jiffies(cputime.utime);
1376 info.si_stime = cputime_to_clock_t(cputime_add(tsk->stime, 1377 info.si_stime = cputime_to_jiffies(cputime.stime);
1377 tsk->signal->stime));
1378 1378
1379 info.si_status = tsk->exit_code & 0x7f; 1379 info.si_status = tsk->exit_code & 0x7f;
1380 if (tsk->exit_code & 0x80) 1380 if (tsk->exit_code & 0x80)