diff options
| author | John Stultz <john.stultz@linaro.org> | 2012-05-03 15:43:40 -0400 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-03-22 19:19:59 -0400 |
| commit | 1ff3c9677bff7e468e0c487d0ffefe4e901d33f4 (patch) | |
| tree | 202cef5857654e15eb471c2216f37f995f1c6e2f /include | |
| parent | cc244ddae6d4c6902ac9d7d64023534f8c44a7eb (diff) | |
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 'include')
| -rw-r--r-- | include/linux/time.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/time.h | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index 47210a175e78..22d81b3c955b 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
| @@ -183,6 +183,7 @@ extern u64 timekeeping_max_deferment(void); | |||
| 183 | extern int timekeeping_inject_offset(struct timespec *ts); | 183 | extern int timekeeping_inject_offset(struct timespec *ts); |
| 184 | extern s32 timekeeping_get_tai_offset(void); | 184 | extern s32 timekeeping_get_tai_offset(void); |
| 185 | extern void timekeeping_set_tai_offset(s32 tai_offset); | 185 | extern void timekeeping_set_tai_offset(s32 tai_offset); |
| 186 | extern void timekeeping_clocktai(struct timespec *ts); | ||
| 186 | 187 | ||
| 187 | struct tms; | 188 | struct tms; |
| 188 | extern void do_sys_times(struct tms *); | 189 | extern void do_sys_times(struct tms *); |
diff --git a/include/uapi/linux/time.h b/include/uapi/linux/time.h index 0d3c0edc3eda..e75e1b6ff27f 100644 --- a/include/uapi/linux/time.h +++ b/include/uapi/linux/time.h | |||
| @@ -54,11 +54,9 @@ struct itimerval { | |||
| 54 | #define CLOCK_BOOTTIME 7 | 54 | #define CLOCK_BOOTTIME 7 |
| 55 | #define CLOCK_REALTIME_ALARM 8 | 55 | #define CLOCK_REALTIME_ALARM 8 |
| 56 | #define CLOCK_BOOTTIME_ALARM 9 | 56 | #define CLOCK_BOOTTIME_ALARM 9 |
| 57 | #define CLOCK_SGI_CYCLE 10 /* Hardware specific */ | ||
| 58 | #define CLOCK_TAI 11 | ||
| 57 | 59 | ||
| 58 | /* | ||
| 59 | * The IDs of various hardware clocks: | ||
| 60 | */ | ||
| 61 | #define CLOCK_SGI_CYCLE 10 | ||
| 62 | #define MAX_CLOCKS 16 | 60 | #define MAX_CLOCKS 16 |
| 63 | #define CLOCKS_MASK (CLOCK_REALTIME | CLOCK_MONOTONIC) | 61 | #define CLOCKS_MASK (CLOCK_REALTIME | CLOCK_MONOTONIC) |
| 64 | #define CLOCKS_MONO CLOCK_MONOTONIC | 62 | #define CLOCKS_MONO CLOCK_MONOTONIC |
