[18/19] y2038: introduce jiffies_to_timespec64

Message ID 1430929826-318934-19-git-send-email-arnd@arndb.de
State Not applicable
Headers

Commit Message

Arnd Bergmann May 6, 2015, 4:30 p.m. UTC
  Needed for converting sys_sched_rr_get_interval

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 include/linux/jiffies.h | 12 +++++++++---
 kernel/time/time.c      |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)
  

Comments

Thomas Gleixner May 19, 2015, 9:25 a.m. UTC | #1
On Wed, 6 May 2015, Arnd Bergmann wrote:

> Needed for converting sys_sched_rr_get_interval
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
  

Patch

diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index 2aeb872f5547..6647257fa3da 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -301,9 +301,15 @@  static inline unsigned long timespec64_to_jiffies(const struct timespec64 *value
 	return __timespec_to_jiffies(value->tv_sec, value->tv_nsec);
 }
 
-
-extern void jiffies_to_timespec(const unsigned long jiffies,
-				struct timespec *value);
+extern void jiffies_to_timespec64(const unsigned long jiffies,
+				  struct timespec64 *value);
+static inline void jiffies_to_timespec(const unsigned long jiffies,
+				       struct timespec *value)
+{
+	struct timespec64 ts64;
+	jiffies_to_timespec64(jiffies, &ts64);
+	*value = timespec64_to_timespec(ts64);
+}
 extern unsigned long timeval_to_jiffies(const struct timeval *value);
 extern void jiffies_to_timeval(const unsigned long jiffies,
 			       struct timeval *value);
diff --git a/kernel/time/time.c b/kernel/time/time.c
index 4d96236c07b0..5e71dbd36fff 100644
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
@@ -588,7 +588,7 @@  __timespec_to_jiffies(unsigned long sec, long nsec)
 EXPORT_SYMBOL(__timespec_to_jiffies);
 
 void
-jiffies_to_timespec(const unsigned long jiffies, struct timespec *value)
+jiffies_to_timespec64(const unsigned long jiffies, struct timespec64 *value)
 {
 	/*
 	 * Convert jiffies to nanoseconds and separate with