diff options
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 0514da573f22..ba60eeeb63aa 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
| @@ -1370,10 +1370,9 @@ void do_notify_parent(struct task_struct *tsk, int sig) | |||
| 1370 | 1370 | ||
| 1371 | info.si_uid = tsk->uid; | 1371 | info.si_uid = tsk->uid; |
| 1372 | 1372 | ||
| 1373 | /* FIXME: find out whether or not this is supposed to be c*time. */ | 1373 | info.si_utime = cputime_to_clock_t(cputime_add(tsk->utime, |
| 1374 | info.si_utime = cputime_to_jiffies(cputime_add(tsk->utime, | ||
| 1375 | tsk->signal->utime)); | 1374 | tsk->signal->utime)); |
| 1376 | info.si_stime = cputime_to_jiffies(cputime_add(tsk->stime, | 1375 | info.si_stime = cputime_to_clock_t(cputime_add(tsk->stime, |
| 1377 | tsk->signal->stime)); | 1376 | tsk->signal->stime)); |
| 1378 | 1377 | ||
| 1379 | info.si_status = tsk->exit_code & 0x7f; | 1378 | info.si_status = tsk->exit_code & 0x7f; |
| @@ -1441,9 +1440,8 @@ static void do_notify_parent_cldstop(struct task_struct *tsk, int why) | |||
| 1441 | 1440 | ||
| 1442 | info.si_uid = tsk->uid; | 1441 | info.si_uid = tsk->uid; |
| 1443 | 1442 | ||
| 1444 | /* FIXME: find out whether or not this is supposed to be c*time. */ | 1443 | info.si_utime = cputime_to_clock_t(tsk->utime); |
| 1445 | info.si_utime = cputime_to_jiffies(tsk->utime); | 1444 | info.si_stime = cputime_to_clock_t(tsk->stime); |
| 1446 | info.si_stime = cputime_to_jiffies(tsk->stime); | ||
| 1447 | 1445 | ||
| 1448 | info.si_code = why; | 1446 | info.si_code = why; |
| 1449 | switch (why) { | 1447 | switch (why) { |