diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-07-16 17:05:01 -0400 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2014-07-23 18:01:48 -0400 |
commit | 61edec81d260bc96a73c878bbdb4c614460346da (patch) | |
tree | a683a37b4e6be8b1b5bea1a1fb1b509d94274fe7 /kernel/time | |
parent | 47da70d32535000ec29cc206cfc1d318fbd8761f (diff) |
timekeeping: Simplify timekeeping_clocktai()
timekeeping_clocktai() is not used in fast pathes, so the extra
timespec conversion is not problematic.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/timekeeping.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 50d5de05b837..118e91e3071c 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
@@ -497,37 +497,6 @@ void ktime_get_ts64(struct timespec64 *ts) | |||
497 | } | 497 | } |
498 | EXPORT_SYMBOL_GPL(ktime_get_ts64); | 498 | EXPORT_SYMBOL_GPL(ktime_get_ts64); |
499 | 499 | ||
500 | |||
501 | /** | ||
502 | * timekeeping_clocktai - Returns the TAI time of day in a timespec | ||
503 | * @ts: pointer to the timespec to be set | ||
504 | * | ||
505 | * Returns the time of day in a timespec. | ||
506 | */ | ||
507 | void timekeeping_clocktai(struct timespec *ts) | ||
508 | { | ||
509 | struct timekeeper *tk = &tk_core.timekeeper; | ||
510 | struct timespec64 ts64; | ||
511 | unsigned long seq; | ||
512 | u64 nsecs; | ||
513 | |||
514 | WARN_ON(timekeeping_suspended); | ||
515 | |||
516 | do { | ||
517 | seq = read_seqcount_begin(&tk_core.seq); | ||
518 | |||
519 | ts64.tv_sec = tk->xtime_sec + tk->tai_offset; | ||
520 | nsecs = timekeeping_get_ns(tk); | ||
521 | |||
522 | } while (read_seqcount_retry(&tk_core.seq, seq)); | ||
523 | |||
524 | ts64.tv_nsec = 0; | ||
525 | timespec64_add_ns(&ts64, nsecs); | ||
526 | *ts = timespec64_to_timespec(ts64); | ||
527 | |||
528 | } | ||
529 | EXPORT_SYMBOL(timekeeping_clocktai); | ||
530 | |||
531 | #ifdef CONFIG_NTP_PPS | 500 | #ifdef CONFIG_NTP_PPS |
532 | 501 | ||
533 | /** | 502 | /** |