diff options
| author | Luca Coelho <luciano.coelho@intel.com> | 2018-09-24 11:57:46 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-09-24 12:10:13 +0200 |
| commit | c42ccbae79bdc77e2a2356172d51b78997b8455f (patch) | |
| tree | fb00e3d8d036f5449f138f7e2aff54b15e8bcc5a | |
| parent | e1613d0c99e7ff352c0d59aa6a99ba1a3d8eb609 (diff) | |
backport: add ktime_get_raw_ts64() backport for < 3.19
The getrawmonotonic64() function that is used by the
ktime_get_raw_ts64() backport was only introduced in 3.19. To fix
compilation with earlier kernels, do the convertion from
getrawmonotonic() manually if the kernel is < 3.19.
Additionally, add timespec_to_timespec64() that we need for this
conversion (and which was only introduced in 3.17).
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | backport/backport-include/linux/timekeeping.h | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/backport/backport-include/linux/timekeeping.h b/backport/backport-include/linux/timekeeping.h index aebb00ca..71871531 100644 --- a/backport/backport-include/linux/timekeeping.h +++ b/backport/backport-include/linux/timekeeping.h @@ -55,11 +55,40 @@ static inline void ktime_get_ts64(struct timespec64 *ts) } #endif +#if LINUX_VERSION_IS_LESS(3,17,0) +/* This was introduced in 4.15, but we only need it in the + * ktime_get_raw_ts64 backport() for < 3.17. + */ +#if __BITS_PER_LONG == 64 +static inline struct timespec64 timespec_to_timespec64(const struct timespec ts) +{ + return *(const struct timespec64 *)&ts; +} + +#else +static inline struct timespec64 timespec_to_timespec64(const struct timespec ts) +{ + struct timespec64 ret; + + ret.tv_sec = ts.tv_sec; + ret.tv_nsec = ts.tv_nsec; + return ret; +} +#endif +#endif /* < 3.17 */ + #if LINUX_VERSION_IS_LESS(4,18,0) #define ktime_get_raw_ts64 LINUX_BACKPORT(ktime_get_raw_ts64) static inline void ktime_get_raw_ts64(struct timespec64 *ts) { +#if LINUX_VERSION_IS_LESS(3,19,0) + struct timespec64 ts64; + + getrawmonotonic(&ts64); + *ts = timespec_to_timespec64(ts64); +#else return getrawmonotonic64(ts); +#endif /* < 3.19 */ } #endif |