X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Fwrapper%2Ftimer.h;h=f57b88f5d528a200893b5a3ce01702c4840ebac1;hb=861292216239a98feb4eba0fe9777f0dfcd6c48a;hp=76c8a572bf9fddb597e1e45adbd6d342daa5a00a;hpb=117ab60f69a98dcbc365de8008ab93e6699d153a;p=lttng-modules.git

diff --git a/include/wrapper/timer.h b/include/wrapper/timer.h
index 76c8a572..f57b88f5 100644
--- a/include/wrapper/timer.h
+++ b/include/wrapper/timer.h
@@ -10,9 +10,8 @@
 #ifndef _LTTNG_WRAPPER_TIMER_H
 #define _LTTNG_WRAPPER_TIMER_H
 
-#include <linux/version.h>
-#include <linux/timer.h>
 #include <lttng/kernel-version.h>
+#include <linux/timer.h>
 
 /*
  * In the olden days, pinned timers were initialized normaly with init_timer()
@@ -26,7 +25,7 @@
  */
 
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0))
 
 #define LTTNG_TIMER_PINNED		TIMER_PINNED
 #define LTTNG_TIMER_FUNC_ARG_TYPE	struct timer_list *
@@ -41,11 +40,11 @@
 	timer_setup(timer, callback, flags)
 
 
-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) */
+#else /* LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0) */
 
 
 # if (LTTNG_RT_VERSION_CODE >= LTTNG_RT_KERNEL_VERSION(4,6,4,8) \
-	|| LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0))
+	|| LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,8,0))
 
 #define lttng_init_timer_pinned(timer) \
 	init_timer_pinned(timer)
@@ -84,6 +83,6 @@ static inline void lttng_timer_setup(struct timer_list *timer,
 	timer->data = (unsigned long)data;
 }
 
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) */
+#endif /* LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,15,0) */
 
 #endif /* _LTTNG_WRAPPER_TIMER_H */