From e9f828cc189b4ac844b8aa7aa31f1e5e4dbcc6d6 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 25 Aug 2016 17:39:47 -0400 Subject: [PATCH] Fix: timer wrapper: support kernels >= 4.8 Signed-off-by: Mathieu Desnoyers --- wrapper/timer.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wrapper/timer.h b/wrapper/timer.h index 441a0172..c1c0c952 100644 --- a/wrapper/timer.h +++ b/wrapper/timer.h @@ -28,7 +28,8 @@ #include -#if (LTTNG_RT_VERSION_CODE >= LTTNG_RT_KERNEL_VERSION(4,6,4,8)) +#if (LTTNG_RT_VERSION_CODE >= LTTNG_RT_KERNEL_VERSION(4,6,4,8) \ + || LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)) #define lttng_init_timer_pinned(timer) \ init_timer_pinned(timer) @@ -39,7 +40,7 @@ static inline int lttng_mod_timer_pinned(struct timer_list *timer, return mod_timer(timer, expires); } -#else /* #if (LTTNG_RT_VERSION_CODE >= LTTNG_RT_KERNEL_VERSION(4,6,4,8)) */ +#else #define lttng_init_timer_pinned(timer) \ init_timer(timer) @@ -50,6 +51,6 @@ static inline int lttng_mod_timer_pinned(struct timer_list *timer, return mod_timer_pinned(timer, expires); } -#endif /* #else #if (LTTNG_RT_VERSION_CODE >= LTTNG_RT_KERNEL_VERSION(4,6,4,8)) */ +#endif #endif /* _LTTNG_WRAPPER_TIMER_H */ -- 2.34.1