aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2012-05-03 15:30:07 -0400
committerJohn Stultz <john.stultz@linaro.org>2013-03-22 19:19:58 -0400
commitcc244ddae6d4c6902ac9d7d64023534f8c44a7eb (patch)
tree9f9e26d214bd0113d8722c0a683e003cbc1bf165 /include/linux
parente445cf1c4257cc0238d72e4129eb4739f46fd3de (diff)
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')
-rw-r--r--include/linux/time.h2
-rw-r--r--include/linux/timekeeper_internal.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/time.h b/include/linux/time.h
index d4835dfdf25e..47210a175e78 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -181,6 +181,8 @@ extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
181extern int timekeeping_valid_for_hres(void); 181extern int timekeeping_valid_for_hres(void);
182extern u64 timekeeping_max_deferment(void); 182extern u64 timekeeping_max_deferment(void);
183extern int timekeeping_inject_offset(struct timespec *ts); 183extern int timekeeping_inject_offset(struct timespec *ts);
184extern s32 timekeeping_get_tai_offset(void);
185extern void timekeeping_set_tai_offset(s32 tai_offset);
184 186
185struct tms; 187struct tms;
186extern void do_sys_times(struct tms *); 188extern void do_sys_times(struct tms *);
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 {
62 ktime_t offs_boot; 62 ktime_t offs_boot;
63 /* The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock. */ 63 /* The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock. */
64 struct timespec raw_time; 64 struct timespec raw_time;
65 /* The current UTC to TAI offset in seconds */
66 s32 tai_offset;
67
65 /* Seqlock for all timekeeper values */ 68 /* Seqlock for all timekeeper values */
66 seqlock_t lock; 69 seqlock_t lock;
67}; 70};