time: Introduce jiffies64_to_nsecs()

This will be needed for the cputime_t to nsec conversion.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Link: http://lkml.kernel.org/r/1485832191-26889-2-git-send-email-fweisbec@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
(cherry picked from commit 07e5f5e353aaa61696c8353d87050994a0c4648a)

Orabug: 28806208

This backport makes jiffies64_to_nsecs() available for the next patch.

Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
Reviewed-by: Joe Jin <joe.jin@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index c367cbdf73ab1a5b83f1af48c848be21b466167d..1161e5cba0df3b1122baf87e0b3f30de175e65c1 100644 (file)
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -288,6 +288,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);
 extern unsigned long usecs_to_jiffies(const unsigned int u);
 extern unsigned long timespec_to_jiffies(const struct timespec *value);

diff --git a/kernel/time/time.c b/kernel/time/time.c
index 2c85b7724af4b0081a112e1b12cbcce4ef831117..0f7203dcf5e0a20503ddfb399fcd3683bebf6d02 100644 (file)
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
@@ -716,6 +716,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 511bdf2cafdaa2794834ec1695ace5a587cf2022..a0ab1482a47921ddf6037085a97bd69684e2d6b8 100644 (file)
--- 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"