From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751527AbdBAJ7o (ORCPT ); Wed, 1 Feb 2017 04:59:44 -0500 Received: from terminus.zytor.com ([65.50.211.136]:54786 "EHLO terminus.zytor.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751292AbdBAJ7k (ORCPT ); Wed, 1 Feb 2017 04:59:40 -0500 Date: Wed, 1 Feb 2017 01:57:28 -0800 From: tip-bot for Frederic Weisbecker Message-ID: Cc: sgruszka@redhat.com, riel@redhat.com, benh@kernel.crashing.org, fenghua.yu@intel.com, linux-kernel@vger.kernel.org, peterz@infradead.org, fweisbec@gmail.com, torvalds@linux-foundation.org, paulus@samba.org, hpa@zytor.com, wanpeng.li@hotmail.com, heiko.carstens@de.ibm.com, tglx@linutronix.de, mpe@ellerman.id.au, schwidefsky@de.ibm.com, tony.luck@intel.com, mingo@kernel.org Reply-To: wanpeng.li@hotmail.com, heiko.carstens@de.ibm.com, tglx@linutronix.de, mpe@ellerman.id.au, schwidefsky@de.ibm.com, tony.luck@intel.com, mingo@kernel.org, sgruszka@redhat.com, riel@redhat.com, benh@kernel.crashing.org, fenghua.yu@intel.com, fweisbec@gmail.com, peterz@infradead.org, linux-kernel@vger.kernel.org, paulus@samba.org, torvalds@linux-foundation.org, hpa@zytor.com In-Reply-To: <1485832191-26889-16-git-send-email-fweisbec@gmail.com> References: <1485832191-26889-16-git-send-email-fweisbec@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] signal: Convert obsolete cputime type to nsecs Git-Commit-ID: bde8285e5cf78417afda79f53bbc26ef801a27e7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: bde8285e5cf78417afda79f53bbc26ef801a27e7 Gitweb: http://git.kernel.org/tip/bde8285e5cf78417afda79f53bbc26ef801a27e7 Author: Frederic Weisbecker AuthorDate: Tue, 31 Jan 2017 04:09:31 +0100 Committer: Ingo Molnar CommitDate: Wed, 1 Feb 2017 09:13:53 +0100 signal: Convert obsolete cputime type to nsecs Use the new nsec based cputime accessors as part of the whole cputime conversion from cputime_t to nsecs. Signed-off-by: Frederic Weisbecker Cc: Benjamin Herrenschmidt Cc: Fenghua Yu Cc: Heiko Carstens Cc: Linus Torvalds Cc: Martin Schwidefsky Cc: Michael Ellerman Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Rik van Riel Cc: Stanislaw Gruszka Cc: Thomas Gleixner Cc: Tony Luck Cc: Wanpeng Li Link: http://lkml.kernel.org/r/1485832191-26889-16-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar --- kernel/signal.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel/signal.c b/kernel/signal.c index b635221..13f9def 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1581,7 +1581,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); @@ -1619,9 +1619,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) @@ -1685,7 +1685,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; @@ -1704,9 +1704,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) {