diff options
| author | John Stultz <john.stultz@linaro.org> | 2014-07-16 21:04:01 +0000 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2014-07-23 10:17:54 -0700 |
| commit | 7d489d15ce4be5310ca60e5896df833f9b3b4088 (patch) | |
| tree | cc1014424d4d040f282fa66dba8a387a3d42051a /include/linux/timekeeper_internal.h | |
| parent | 49cd6f869984692547c57621bf42697aaa7f5622 (diff) | |
| download | linux-stable-7d489d15ce4be5310ca60e5896df833f9b3b4088.tar.gz linux-stable-7d489d15ce4be5310ca60e5896df833f9b3b4088.tar.bz2 linux-stable-7d489d15ce4be5310ca60e5896df833f9b3b4088.zip | |
timekeeping: Convert timekeeping core to use timespec64s
Convert the core timekeeping logic to use timespec64s. This moves the
2038 issues out of the core logic and into all of the accessor
functions.
Future changes will need to push the timespec64s out to all
timekeeping users, but that can be done interface by interface.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include/linux/timekeeper_internal.h')
| -rw-r--r-- | include/linux/timekeeper_internal.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h index c1825eb436ed..1b05491e10f9 100644 --- a/include/linux/timekeeper_internal.h +++ b/include/linux/timekeeper_internal.h @@ -55,15 +55,15 @@ struct timekeeper { * - wall_to_monotonic is no longer the boot time, getboottime must be * used instead. */ - struct timespec wall_to_monotonic; + struct timespec64 wall_to_monotonic; /* Offset clock monotonic -> clock realtime */ ktime_t offs_real; /* time spent in suspend */ - struct timespec total_sleep_time; + struct timespec64 total_sleep_time; /* Offset clock monotonic -> clock boottime */ ktime_t offs_boot; /* The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock. */ - struct timespec raw_time; + struct timespec64 raw_time; /* The current UTC to TAI offset in seconds */ s32 tai_offset; /* Offset clock monotonic -> clock tai */ @@ -71,9 +71,9 @@ struct timekeeper { }; -static inline struct timespec tk_xtime(struct timekeeper *tk) +static inline struct timespec64 tk_xtime(struct timekeeper *tk) { - struct timespec ts; + struct timespec64 ts; ts.tv_sec = tk->xtime_sec; ts.tv_nsec = (long)(tk->xtime_nsec >> tk->shift); |