summaryrefslogtreecommitdiffstats
path: root/kernel/time/timekeeping.c
diff options
context:
space:
mode:
authorJohn Stultz2012-05-03 21:43:40 +0200
committerJohn Stultz2013-03-23 00:19:59 +0100
commit1ff3c9677bff7e468e0c487d0ffefe4e901d33f4 (patch)
tree202cef5857654e15eb471c2216f37f995f1c6e2f /kernel/time/timekeeping.c
parenttimekeeping: Move TAI managment into timekeeping core from ntp (diff)
downloadkernel-qcow2-linux-1ff3c9677bff7e468e0c487d0ffefe4e901d33f4.tar.gz
kernel-qcow2-linux-1ff3c9677bff7e468e0c487d0ffefe4e901d33f4.tar.xz
kernel-qcow2-linux-1ff3c9677bff7e468e0c487d0ffefe4e901d33f4.zip
timekeeping: Add CLOCK_TAI clockid
This add a CLOCK_TAI clockid and the needed accessors. CC: Thomas Gleixner <tglx@linutronix.de> CC: Eric Dumazet <eric.dumazet@gmail.com> CC: Richard Cochran <richardcochran@gmail.com> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/time/timekeeping.c')
-rw-r--r--kernel/time/timekeeping.c30
1 files changed, 30 insertions, 0 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 937098aab498..8a842756572d 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -379,6 +379,36 @@ void ktime_get_ts(struct timespec *ts)
}
EXPORT_SYMBOL_GPL(ktime_get_ts);
+
+/**
+ * timekeeping_clocktai - Returns the TAI time of day in a timespec
+ * @ts: pointer to the timespec to be set
+ *
+ * Returns the time of day in a timespec.
+ */
+void timekeeping_clocktai(struct timespec *ts)
+{
+ struct timekeeper *tk = &timekeeper;
+ unsigned long seq;
+ u64 nsecs;
+
+ WARN_ON(timekeeping_suspended);
+
+ do {
+ seq = read_seqbegin(&tk->lock);
+
+ ts->tv_sec = tk->xtime_sec + tk->tai_offset;
+ nsecs = timekeeping_get_ns(tk);
+
+ } while (read_seqretry(&tk->lock, seq));
+
+ ts->tv_nsec = 0;
+ timespec_add_ns(ts, nsecs);
+
+}
+EXPORT_SYMBOL(timekeeping_clocktai);
+
+
#ifdef CONFIG_NTP_PPS
/**