aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/signal.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 3603d93a1968..13f9def8b24a 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1581,7 +1581,7 @@ bool do_notify_parent(struct task_struct *tsk, int sig)
1581 unsigned long flags; 1581 unsigned long flags;
1582 struct sighand_struct *psig; 1582 struct sighand_struct *psig;
1583 bool autoreap = false; 1583 bool autoreap = false;
1584 cputime_t utime, stime; 1584 u64 utime, stime;
1585 1585
1586 BUG_ON(sig == -1); 1586 BUG_ON(sig == -1);
1587 1587
@@ -1620,8 +1620,8 @@ bool do_notify_parent(struct task_struct *tsk, int sig)
1620 rcu_read_unlock(); 1620 rcu_read_unlock();
1621 1621
1622 task_cputime(tsk, &utime, &stime); 1622 task_cputime(tsk, &utime, &stime);
1623 info.si_utime = cputime_to_clock_t(utime + tsk->signal->utime); 1623 info.si_utime = nsec_to_clock_t(utime + tsk->signal->utime);
1624 info.si_stime = cputime_to_clock_t(stime + tsk->signal->stime); 1624 info.si_stime = nsec_to_clock_t(stime + tsk->signal->stime);
1625 1625
1626 info.si_status = tsk->exit_code & 0x7f; 1626 info.si_status = tsk->exit_code & 0x7f;
1627 if (tsk->exit_code & 0x80) 1627 if (tsk->exit_code & 0x80)
@@ -1685,7 +1685,7 @@ static void do_notify_parent_cldstop(struct task_struct *tsk,
1685 unsigned long flags; 1685 unsigned long flags;
1686 struct task_struct *parent; 1686 struct task_struct *parent;
1687 struct sighand_struct *sighand; 1687 struct sighand_struct *sighand;
1688 cputime_t utime, stime; 1688 u64 utime, stime;
1689 1689
1690 if (for_ptracer) { 1690 if (for_ptracer) {
1691 parent = tsk->parent; 1691 parent = tsk->parent;
@@ -1705,8 +1705,8 @@ static void do_notify_parent_cldstop(struct task_struct *tsk,
1705 rcu_read_unlock(); 1705 rcu_read_unlock();
1706 1706
1707 task_cputime(tsk, &utime, &stime); 1707 task_cputime(tsk, &utime, &stime);
1708 info.si_utime = cputime_to_clock_t(utime); 1708 info.si_utime = nsec_to_clock_t(utime);
1709 info.si_stime = cputime_to_clock_t(stime); 1709 info.si_stime = nsec_to_clock_t(stime);
1710 1710
1711 info.si_code = why; 1711 info.si_code = why;
1712 switch (why) { 1712 switch (why) {