From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751510AbdBAJvS (ORCPT ); Wed, 1 Feb 2017 04:51:18 -0500 Received: from terminus.zytor.com ([65.50.211.136]:53856 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751086AbdBAJvP (ORCPT ); Wed, 1 Feb 2017 04:51:15 -0500 Date: Wed, 1 Feb 2017 01:50:15 -0800 From: tip-bot for Frederic Weisbecker Message-ID: Cc: heiko.carstens@de.ibm.com, paulus@samba.org, wanpeng.li@hotmail.com, sgruszka@redhat.com, fweisbec@gmail.com, tglx@linutronix.de, fenghua.yu@intel.com, riel@redhat.com, tony.luck@intel.com, hpa@zytor.com, peterz@infradead.org, mpe@ellerman.id.au, schwidefsky@de.ibm.com, linux-kernel@vger.kernel.org, benh@kernel.crashing.org, mingo@kernel.org Reply-To: fweisbec@gmail.com, tglx@linutronix.de, riel@redhat.com, fenghua.yu@intel.com, sgruszka@redhat.com, paulus@samba.org, wanpeng.li@hotmail.com, heiko.carstens@de.ibm.com, mingo@kernel.org, benh@kernel.crashing.org, linux-kernel@vger.kernel.org, schwidefsky@de.ibm.com, mpe@ellerman.id.au, peterz@infradead.org, tony.luck@intel.com, hpa@zytor.com In-Reply-To: <1485832191-26889-2-git-send-email-fweisbec@gmail.com> References: <1485832191-26889-2-git-send-email-fweisbec@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] time: Introduce jiffies64_to_nsecs() Git-Commit-ID: 07e5f5e353aaa61696c8353d87050994a0c4648a 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: 07e5f5e353aaa61696c8353d87050994a0c4648a Gitweb: http://git.kernel.org/tip/07e5f5e353aaa61696c8353d87050994a0c4648a Author: Frederic Weisbecker AuthorDate: Tue, 31 Jan 2017 04:09:17 +0100 Committer: Ingo Molnar CommitDate: Wed, 1 Feb 2017 09:13:45 +0100 time: Introduce jiffies64_to_nsecs() This will be needed for the cputime_t to nsec conversion. Signed-off-by: Frederic Weisbecker Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: Tony Luck Cc: Fenghua Yu Cc: Peter Zijlstra Cc: Rik van Riel Cc: Stanislaw Gruszka Cc: Wanpeng Li Link: http://lkml.kernel.org/r/1485832191-26889-2-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar --- include/linux/jiffies.h | 2 ++ kernel/time/time.c | 10 ++++++++++ kernel/time/timeconst.bc | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index 589d14e..624215c 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h @@ -293,6 +293,8 @@ static inline u64 jiffies_to_nsecs(const unsigned long j) return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC; } +extern u64 jiffies64_to_nsecs(u64 j); + extern unsigned long __msecs_to_jiffies(const unsigned int m); #if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ) /* diff --git a/kernel/time/time.c b/kernel/time/time.c index a3a9a8a..25bdd25 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -702,6 +702,16 @@ u64 nsec_to_clock_t(u64 x) #endif } +u64 jiffies64_to_nsecs(u64 j) +{ +#if !(NSEC_PER_SEC % HZ) + return (NSEC_PER_SEC / HZ) * j; +# else + return div_u64(j * HZ_TO_NSEC_NUM, HZ_TO_NSEC_DEN); +#endif +} +EXPORT_SYMBOL(jiffies64_to_nsecs); + /** * nsecs_to_jiffies64 - Convert nsecs in u64 to jiffies64 * diff --git a/kernel/time/timeconst.bc b/kernel/time/timeconst.bc index c486889..f83bbb8 100644 --- a/kernel/time/timeconst.bc +++ b/kernel/time/timeconst.bc @@ -98,6 +98,12 @@ define timeconst(hz) { print "#define HZ_TO_USEC_DEN\t\t", hz/cd, "\n" print "#define USEC_TO_HZ_NUM\t\t", hz/cd, "\n" print "#define USEC_TO_HZ_DEN\t\t", 1000000/cd, "\n" + + cd=gcd(hz,1000000000) + print "#define HZ_TO_NSEC_NUM\t\t", 1000000000/cd, "\n" + print "#define HZ_TO_NSEC_DEN\t\t", hz/cd, "\n" + print "#define NSEC_TO_HZ_NUM\t\t", hz/cd, "\n" + print "#define NSEC_TO_HZ_DEN\t\t", 1000000000/cd, "\n" print "\n" print "#endif /* KERNEL_TIMECONST_H */\n"