From: Johannes Berg <johannes.berg@xxxxxxxxx> ... and simplify the code while at it. Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> --- backport/backport-include/linux/timekeeping.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/backport/backport-include/linux/timekeeping.h b/backport/backport-include/linux/timekeeping.h index 80c625569d6e..87744572bce6 100644 --- a/backport/backport-include/linux/timekeeping.h +++ b/backport/backport-include/linux/timekeeping.h @@ -6,23 +6,18 @@ #include_next <linux/timekeeping.h> #if LINUX_VERSION_IS_LESS(5,3,0) -#define ktime_get_boottime_ns LINUX_BACKPORT(ktime_get_boottime_ns) -static inline u64 ktime_get_boottime_ns(void) -{ - return ktime_get_boot_ns(); -} +#define ktime_get_boottime_ns ktime_get_boot_ns +#define ktime_get_coarse_boottime_ns ktime_get_boot_ns #endif /* < 5.3 */ #if LINUX_VERSION_IS_LESS(4,18,0) extern time64_t ktime_get_boottime_seconds(void); -#endif /* < 4.18 */ -#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) { return getrawmonotonic64(ts); } -#endif +#endif /* < 4.18 */ #endif /* __BACKPORT_TIMEKEEPING_H */ -- 2.37.3 -- To unsubscribe from this list: send the line "unsubscribe backports" in