From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 25 Aug 2016 21:39:47 +0000 (-0400)
Subject: Fix: timer wrapper: support kernels >= 4.8
X-Git-Tag: v2.8.1~12
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;ds=sidebyside;h=9889a003260b4fd46caba76c21be985f7205ac8f;p=lttng-modules.git

Fix: timer wrapper: support kernels >= 4.8

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

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 <lttng-kernel-version.h>
 
 
-#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 */