Merge tag 'nfsd-4.3' of git://linux-nfs.org/~bfields/linux

[linux-2.6-block.git] / include / linux / timekeeping.h

diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 6e191e4e6ab637d8924528c61dc551711d085df2..ba0ae09cbb21f2038c71104a435f6782f70c1668 100644 (file)
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -18,10 +18,17 @@ extern int do_sys_settimeofday(const struct timespec *tv,
  * Kernel time accessors
  */
 unsigned long get_seconds(void);
-struct timespec current_kernel_time(void);
+struct timespec64 current_kernel_time64(void);
 /* does not take xtime_lock */
 struct timespec __current_kernel_time(void);
 
+static inline struct timespec current_kernel_time(void)
+{
+       struct timespec64 now = current_kernel_time64();
+
+       return timespec64_to_timespec(now);
+}
+
 /*
  * timespec based interfaces
  */