From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751723AbdBAJ5v (ORCPT ); Wed, 1 Feb 2017 04:57:51 -0500 Received: from terminus.zytor.com ([65.50.211.136]:54662 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751336AbdBAJ5u (ORCPT ); Wed, 1 Feb 2017 04:57:50 -0500 Date: Wed, 1 Feb 2017 01:56:28 -0800 From: tip-bot for Frederic Weisbecker Message-ID: Cc: tony.luck@intel.com, tglx@linutronix.de, fweisbec@gmail.com, riel@redhat.com, heiko.carstens@de.ibm.com, peterz@infradead.org, torvalds@linux-foundation.org, wanpeng.li@hotmail.com, linux-kernel@vger.kernel.org, benh@kernel.crashing.org, sgruszka@redhat.com, hpa@zytor.com, schwidefsky@de.ibm.com, mpe@ellerman.id.au, mingo@kernel.org, fenghua.yu@intel.com, paulus@samba.org Reply-To: sgruszka@redhat.com, hpa@zytor.com, benh@kernel.crashing.org, schwidefsky@de.ibm.com, mpe@ellerman.id.au, fenghua.yu@intel.com, paulus@samba.org, mingo@kernel.org, tglx@linutronix.de, fweisbec@gmail.com, tony.luck@intel.com, wanpeng.li@hotmail.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, riel@redhat.com, peterz@infradead.org, heiko.carstens@de.ibm.com In-Reply-To: <1485832191-26889-14-git-send-email-fweisbec@gmail.com> References: <1485832191-26889-14-git-send-email-fweisbec@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] delaycct: Convert obsolete cputime type to nsecs Git-Commit-ID: dbf3da1c2d14a6b0b9bac76a3f9912aff48487e7 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: dbf3da1c2d14a6b0b9bac76a3f9912aff48487e7 Gitweb: http://git.kernel.org/tip/dbf3da1c2d14a6b0b9bac76a3f9912aff48487e7 Author: Frederic Weisbecker AuthorDate: Tue, 31 Jan 2017 04:09:29 +0100 Committer: Ingo Molnar CommitDate: Wed, 1 Feb 2017 09:13:52 +0100 delaycct: 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-14-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar --- kernel/delayacct.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/delayacct.c b/kernel/delayacct.c index 228640f..6605496 100644 --- a/kernel/delayacct.c +++ b/kernel/delayacct.c @@ -82,19 +82,19 @@ void __delayacct_blkio_end(void) int __delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk) { - cputime_t utime, stime, stimescaled, utimescaled; + u64 utime, stime, stimescaled, utimescaled; unsigned long long t2, t3; unsigned long flags, t1; s64 tmp; - task_cputime_t(tsk, &utime, &stime); + task_cputime(tsk, &utime, &stime); tmp = (s64)d->cpu_run_real_total; - tmp += cputime_to_nsecs(utime + stime); + tmp += utime + stime; d->cpu_run_real_total = (tmp < (s64)d->cpu_run_real_total) ? 0 : tmp; - task_cputime_t_scaled(tsk, &utimescaled, &stimescaled); + task_cputime_scaled(tsk, &utimescaled, &stimescaled); tmp = (s64)d->cpu_scaled_run_real_total; - tmp += cputime_to_nsecs(utimescaled + stimescaled); + tmp += utimescaled + stimescaled; d->cpu_scaled_run_real_total = (tmp < (s64)d->cpu_scaled_run_real_total) ? 0 : tmp;