aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/timekeeper_internal.h
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2012-05-03 12:30:07 -0700
committerJohn Stultz <john.stultz@linaro.org>2013-03-22 16:19:58 -0700
commitcc244ddae6d4c6902ac9d7d64023534f8c44a7eb (patch)
tree9f9e26d214bd0113d8722c0a683e003cbc1bf165 /include/linux/timekeeper_internal.h
parenttimekeeping: utilize the suspend-nonstop clocksource to count suspended time (diff)
downloadlinux-dev-cc244ddae6d4c6902ac9d7d64023534f8c44a7eb.tar.xz
linux-dev-cc244ddae6d4c6902ac9d7d64023534f8c44a7eb.zip
timekeeping: Move TAI managment into timekeeping core from ntp
Currently NTP manages the TAI offset. Since there's plans for a CLOCK_TAI clockid, push the TAI management into the timekeeping core. 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 'include/linux/timekeeper_internal.h')
-rw-r--r--include/linux/timekeeper_internal.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
index e1d558e237ec..ff94f436f8b7 100644
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
@@ -62,6 +62,9 @@ struct timekeeper {
ktime_t offs_boot;
/* The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock. */
struct timespec raw_time;
+ /* The current UTC to TAI offset in seconds */
+ s32 tai_offset;
+
/* Seqlock for all timekeeper values */
seqlock_t lock;
};