From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751519AbdBAJ5F (ORCPT ); Wed, 1 Feb 2017 04:57:05 -0500 Received: from terminus.zytor.com ([65.50.211.136]:54598 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751266AbdBAJ5D (ORCPT ); Wed, 1 Feb 2017 04:57:03 -0500 Date: Wed, 1 Feb 2017 01:55:58 -0800 From: tip-bot for Frederic Weisbecker Message-ID: Cc: mingo@kernel.org, torvalds@linux-foundation.org, mpe@ellerman.id.au, heiko.carstens@de.ibm.com, linux-kernel@vger.kernel.org, fenghua.yu@intel.com, sgruszka@redhat.com, wanpeng.li@hotmail.com, fweisbec@gmail.com, paulus@samba.org, tony.luck@intel.com, benh@kernel.crashing.org, hpa@zytor.com, peterz@infradead.org, tglx@linutronix.de, schwidefsky@de.ibm.com, riel@redhat.com Reply-To: riel@redhat.com, fweisbec@gmail.com, paulus@samba.org, tony.luck@intel.com, benh@kernel.crashing.org, peterz@infradead.org, hpa@zytor.com, tglx@linutronix.de, schwidefsky@de.ibm.com, mpe@ellerman.id.au, heiko.carstens@de.ibm.com, linux-kernel@vger.kernel.org, fenghua.yu@intel.com, sgruszka@redhat.com, wanpeng.li@hotmail.com, torvalds@linux-foundation.org, mingo@kernel.org In-Reply-To: <1485832191-26889-13-git-send-email-fweisbec@gmail.com> References: <1485832191-26889-13-git-send-email-fweisbec@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] acct: Convert obsolete cputime type to nsecs Git-Commit-ID: d4bc42af73bf297f7182ed978b19850553242195 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: d4bc42af73bf297f7182ed978b19850553242195 Gitweb: http://git.kernel.org/tip/d4bc42af73bf297f7182ed978b19850553242195 Author: Frederic Weisbecker AuthorDate: Tue, 31 Jan 2017 04:09:28 +0100 Committer: Ingo Molnar CommitDate: Wed, 1 Feb 2017 09:13:51 +0100 acct: 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-13-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar --- include/linux/sched.h | 2 +- kernel/acct.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index b7ccc54..75fc773 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -563,7 +563,7 @@ struct pacct_struct { int ac_flag; long ac_exitcode; unsigned long ac_mem; - cputime_t ac_utime, ac_stime; + u64 ac_utime, ac_stime; unsigned long ac_minflt, ac_majflt; }; diff --git a/kernel/acct.c b/kernel/acct.c index b9b190a..ca9cb55 100644 --- a/kernel/acct.c +++ b/kernel/acct.c @@ -453,8 +453,8 @@ static void fill_ac(acct_t *ac) spin_lock_irq(¤t->sighand->siglock); tty = current->signal->tty; /* Safe as we hold the siglock */ ac->ac_tty = tty ? old_encode_dev(tty_devnum(tty)) : 0; - ac->ac_utime = encode_comp_t(jiffies_to_AHZ(cputime_to_jiffies(pacct->ac_utime))); - ac->ac_stime = encode_comp_t(jiffies_to_AHZ(cputime_to_jiffies(pacct->ac_stime))); + ac->ac_utime = encode_comp_t(nsec_to_AHZ(pacct->ac_utime)); + ac->ac_stime = encode_comp_t(nsec_to_AHZ(pacct->ac_stime)); ac->ac_flag = pacct->ac_flag; ac->ac_mem = encode_comp_t(pacct->ac_mem); ac->ac_minflt = encode_comp_t(pacct->ac_minflt); @@ -530,7 +530,7 @@ out: void acct_collect(long exitcode, int group_dead) { struct pacct_struct *pacct = ¤t->signal->pacct; - cputime_t utime, stime; + u64 utime, stime; unsigned long vsize = 0; if (group_dead && current->mm) { @@ -559,7 +559,8 @@ void acct_collect(long exitcode, int group_dead) pacct->ac_flag |= ACORE; if (current->flags & PF_SIGNALED) pacct->ac_flag |= AXSIG; - task_cputime_t(current, &utime, &stime); + + task_cputime(current, &utime, &stime); pacct->ac_utime += utime; pacct->ac_stime += stime; pacct->ac_minflt += current->min_flt;