summaryrefslogtreecommitdiffstats
path: root/include/linux/ktime.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-07-16 21:04:02 +0000
committerJohn Stultz <john.stultz@linaro.org>2014-07-23 10:17:54 -0700
commit8b094cd03b4a3793220d8d8d86a173bfea8c285b (patch)
treefd0e63d38403f4413fa39095e1eff99f7b23d36c /include/linux/ktime.h
parent7d489d15ce4be5310ca60e5896df833f9b3b4088 (diff)
downloadop-kernel-dev-8b094cd03b4a3793220d8d8d86a173bfea8c285b.zip
op-kernel-dev-8b094cd03b4a3793220d8d8d86a173bfea8c285b.tar.gz
time: Consolidate the time accessor prototypes
Right now we have time related prototypes in 3 different header files. Move it to a single timekeeping header file and move the core internal stuff into a core private header. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include/linux/ktime.h')
-rw-r--r--include/linux/ktime.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index da6b680..c9d645a 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -250,12 +250,6 @@ static inline __must_check bool ktime_to_timespec64_cond(const ktime_t kt,
#define LOW_RES_NSEC TICK_NSEC
#define KTIME_LOW_RES (ktime_t){ .tv64 = LOW_RES_NSEC }
-/* Get the monotonic time in timespec format: */
-extern void ktime_get_ts(struct timespec *ts);
-
-/* Get the real (wall-) time in timespec format: */
-#define ktime_get_real_ts(ts) getnstimeofday(ts)
-
static inline ktime_t ns_to_ktime(u64 ns)
{
static const ktime_t ktime_zero = { .tv64 = 0 };
@@ -270,4 +264,6 @@ static inline ktime_t ms_to_ktime(u64 ms)
return ktime_add_ms(ktime_zero, ms);
}
+# include <linux/timekeeping.h>
+
#endif
OpenPOWER on IntegriCloud