diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hrtimer.h | 5 | ||||
| -rw-r--r-- | include/linux/timekeeper_internal.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index cc07d2777bbe..d19a5c2d2270 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h | |||
| @@ -157,6 +157,7 @@ enum hrtimer_base_type { | |||
| 157 | HRTIMER_BASE_MONOTONIC, | 157 | HRTIMER_BASE_MONOTONIC, |
| 158 | HRTIMER_BASE_REALTIME, | 158 | HRTIMER_BASE_REALTIME, |
| 159 | HRTIMER_BASE_BOOTTIME, | 159 | HRTIMER_BASE_BOOTTIME, |
| 160 | HRTIMER_BASE_TAI, | ||
| 160 | HRTIMER_MAX_CLOCK_BASES, | 161 | HRTIMER_MAX_CLOCK_BASES, |
| 161 | }; | 162 | }; |
| 162 | 163 | ||
| @@ -327,7 +328,9 @@ extern ktime_t ktime_get(void); | |||
| 327 | extern ktime_t ktime_get_real(void); | 328 | extern ktime_t ktime_get_real(void); |
| 328 | extern ktime_t ktime_get_boottime(void); | 329 | extern ktime_t ktime_get_boottime(void); |
| 329 | extern ktime_t ktime_get_monotonic_offset(void); | 330 | extern ktime_t ktime_get_monotonic_offset(void); |
| 330 | extern ktime_t ktime_get_update_offsets(ktime_t *offs_real, ktime_t *offs_boot); | 331 | extern ktime_t ktime_get_clocktai(void); |
| 332 | extern ktime_t ktime_get_update_offsets(ktime_t *offs_real, ktime_t *offs_boot, | ||
| 333 | ktime_t *offs_tai); | ||
| 331 | 334 | ||
| 332 | DECLARE_PER_CPU(struct tick_device, tick_cpu_device); | 335 | DECLARE_PER_CPU(struct tick_device, tick_cpu_device); |
| 333 | 336 | ||
diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h index ff94f436f8b7..26700d870506 100644 --- a/include/linux/timekeeper_internal.h +++ b/include/linux/timekeeper_internal.h | |||
| @@ -64,6 +64,8 @@ struct timekeeper { | |||
| 64 | struct timespec raw_time; | 64 | struct timespec raw_time; |
| 65 | /* The current UTC to TAI offset in seconds */ | 65 | /* The current UTC to TAI offset in seconds */ |
| 66 | s32 tai_offset; | 66 | s32 tai_offset; |
| 67 | /* Offset clock monotonic -> clock tai */ | ||
| 68 | ktime_t offs_tai; | ||
| 67 | 69 | ||
| 68 | /* Seqlock for all timekeeper values */ | 70 | /* Seqlock for all timekeeper values */ |
| 69 | seqlock_t lock; | 71 | seqlock_t lock; |
