projects
/
deliverable
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: timer wrapper: support kernels >= 4.8
[deliverable/lttng-modules.git]
/
wrapper
/
timer.h
diff --git
a/wrapper/timer.h
b/wrapper/timer.h
index 441a01723c33f27df5ecf7945ac999ec4c93daf3..c1c0c9526942fcadec87e9a11949b68fe47a56fd 100644
(file)
--- a/
wrapper/timer.h
+++ b/
wrapper/timer.h
@@
-28,7
+28,8
@@
#include <lttng-kernel-version.h>
#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)
#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);
}
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)
#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);
}
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 */
#endif /* _LTTNG_WRAPPER_TIMER_H */
This page took
0.033651 seconds
and
5
git commands to generate.