[PATCH 16/36] signal: Convert obsolete cputime type to nsecs

[Frederic Weisbecker]

Use the new nsec based cputime accessors as part of the whole cputime
conversion from cputime_t to nsecs.

Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Michael Ellerman <m...@ellerman.id.au>
Cc: Heiko Carstens <heiko.carst...@de.ibm.com>
Cc: Martin Schwidefsky <schwidef...@de.ibm.com>
Cc: Tony Luck <tony.l...@intel.com>
Cc: Fenghua Yu <fenghua...@intel.com>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Rik van Riel <r...@redhat.com>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Ingo Molnar <mi...@kernel.org>
Cc: Stanislaw Gruszka <sgrus...@redhat.com>
Cc: Wanpeng Li <wanpeng...@hotmail.com>
Signed-off-by: Frederic Weisbecker <fweis...@gmail.com>
---
 kernel/signal.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/kernel/signal.c b/kernel/signal.c
index 5d5f6f7..2746cf4 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1575,7 +1575,7 @@ bool do_notify_parent(struct task_struct *tsk, int sig)
        unsigned long flags;
        struct sighand_struct *psig;
        bool autoreap = false;
-       cputime_t utime, stime;
+       u64 utime, stime;
 
        BUG_ON(sig == -1);
 
@@ -1613,9 +1613,9 @@ bool do_notify_parent(struct task_struct *tsk, int sig)
                                       task_uid(tsk));
        rcu_read_unlock();
 
-       task_cputime_t(tsk, &utime, &stime);
-       info.si_utime = cputime_to_clock_t(utime + 
nsecs_to_cputime(tsk->signal->utime));
-       info.si_stime = cputime_to_clock_t(stime + 
nsecs_to_cputime(tsk->signal->stime));
+       task_cputime(tsk, &utime, &stime);
+       info.si_utime = nsec_to_clock_t(utime + tsk->signal->utime);
+       info.si_stime = nsec_to_clock_t(stime + tsk->signal->stime);
 
        info.si_status = tsk->exit_code & 0x7f;
        if (tsk->exit_code & 0x80)
@@ -1679,7 +1679,7 @@ static void do_notify_parent_cldstop(struct task_struct 
*tsk,
        unsigned long flags;
        struct task_struct *parent;
        struct sighand_struct *sighand;
-       cputime_t utime, stime;
+       u64 utime, stime;
 
        if (for_ptracer) {
                parent = tsk->parent;
@@ -1698,9 +1698,9 @@ static void do_notify_parent_cldstop(struct task_struct 
*tsk,
        info.si_uid = from_kuid_munged(task_cred_xxx(parent, user_ns), 
task_uid(tsk));
        rcu_read_unlock();
 
-       task_cputime_t(tsk, &utime, &stime);
-       info.si_utime = cputime_to_clock_t(utime);
-       info.si_stime = cputime_to_clock_t(stime);
+       task_cputime(tsk, &utime, &stime);
+       info.si_utime = nsec_to_clock_t(utime);
+       info.si_stime = nsec_to_clock_t(stime);
 
        info.si_code = why;
        switch (why) {
-- 
2.7.4