From 3cde35ad87bc5bd8c7d7f4bb9dd2e1be9c8ce3f2 Mon Sep 17 00:00:00 2001 From: Michael Kerrisk Date: Fri, 25 Jul 2008 01:47:32 -0700 Subject: [PATCH] --- yaml --- r: 105927 b: refs/heads/master c: d8878ba3f05ae5bbfad5a6e72e5121c0ea35f989 h: refs/heads/master i: 105925: b6ad709c3bd2a1964cd71502b0c820eb1b4674e1 105923: 68b4b0ac64af0c127160d7a26e6ba1bb9e563103 105919: 5a10c770edc8bd3a0b23a0877eaf46ac2478853e v: v3 --- [refs] | 2 +- trunk/kernel/signal.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f8e9967a2f03..c301b33d5e5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4901f92a8dbe843e76651a50f7a2a6dd3d53474 +refs/heads/master: d8878ba3f05ae5bbfad5a6e72e5121c0ea35f989 diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c index 0514da573f22..ba60eeeb63aa 100644 --- a/trunk/kernel/signal.c +++ b/trunk/kernel/signal.c @@ -1370,10 +1370,9 @@ void do_notify_parent(struct task_struct *tsk, int sig) info.si_uid = tsk->uid; - /* FIXME: find out whether or not this is supposed to be c*time. */ - info.si_utime = cputime_to_jiffies(cputime_add(tsk->utime, + info.si_utime = cputime_to_clock_t(cputime_add(tsk->utime, tsk->signal->utime)); - info.si_stime = cputime_to_jiffies(cputime_add(tsk->stime, + info.si_stime = cputime_to_clock_t(cputime_add(tsk->stime, tsk->signal->stime)); info.si_status = tsk->exit_code & 0x7f; @@ -1441,9 +1440,8 @@ static void do_notify_parent_cldstop(struct task_struct *tsk, int why) info.si_uid = tsk->uid; - /* FIXME: find out whether or not this is supposed to be c*time. */ - info.si_utime = cputime_to_jiffies(tsk->utime); - info.si_stime = cputime_to_jiffies(tsk->stime); + info.si_utime = cputime_to_clock_t(tsk->utime); + info.si_stime = cputime_to_clock_t(tsk->stime); info.si_code = why; switch (why) {