diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-07-16 21:04:17 (GMT) |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2014-07-23 17:18:00 (GMT) |
| commit | afab07c0e91ecf098abf34573ccfcd86d6be26f9 (patch) | |
| tree | 36f117661404466b11a06fe03f36c942b7a90f62 | |
| parent | b82c817e2d16e818c472eb71019de521816000a3 (diff) | |
| download | linux-afab07c0e91ecf098abf34573ccfcd86d6be26f9.tar.xz | |
timekeeping: Use ktime_t based data for ktime_get_clocktai()
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | include/linux/timekeeping.h | 9 | ||||
| -rw-r--r-- | kernel/time/timekeeping.c | 15 |
2 files changed, 8 insertions, 16 deletions
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index 2fc6062..3050a7d 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -109,7 +109,6 @@ enum tk_offsets { extern ktime_t ktime_get(void); extern ktime_t ktime_get_with_offset(enum tk_offsets offs); extern ktime_t ktime_get_monotonic_offset(void); -extern ktime_t ktime_get_clocktai(void); /** * ktime_get_real - get the real (wall-) time in ktime_t format @@ -130,6 +129,14 @@ static inline ktime_t ktime_get_boottime(void) return ktime_get_with_offset(TK_OFFS_BOOT); } +/** + * ktime_get_clocktai - Returns the TAI time of day in ktime_t format + */ +static inline ktime_t ktime_get_clocktai(void) +{ + return ktime_get_with_offset(TK_OFFS_TAI); +} + /* * RTC specific */ diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 5e60aa0..c083ae2 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -512,21 +512,6 @@ void timekeeping_clocktai(struct timespec *ts) } EXPORT_SYMBOL(timekeeping_clocktai); - -/** - * ktime_get_clocktai - Returns the TAI time of day in a ktime - * - * Returns the time of day in a ktime. - */ -ktime_t ktime_get_clocktai(void) -{ - struct timespec ts; - - timekeeping_clocktai(&ts); - return timespec_to_ktime(ts); -} -EXPORT_SYMBOL(ktime_get_clocktai); - #ifdef CONFIG_NTP_PPS /** |