Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 4eaeb54a27fbf701c2a4908a6e90a978b93deb06 Mon Sep 17 00:00:00 2001 |
| 2 | From: Michael Jeanson <mjeanson@efficios.com> |
| 3 | Date: Thu, 6 Dec 2018 11:31:51 -0500 |
| 4 | Subject: [PATCH 4/9] Fix: timer instrumentation for RHEL 7.6 |
| 5 | |
| 6 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> |
| 7 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> |
| 8 | |
| 9 | Upstream-Status: backport https://github.com/lttng/lttng-modules/commit/4eaeb54a27fbf701c2a4908a6e90a978b93deb06 |
| 10 | |
| 11 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> |
| 12 | --- |
| 13 | instrumentation/events/lttng-module/timer.h | 3 ++- |
| 14 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/instrumentation/events/lttng-module/timer.h b/instrumentation/events/lttng-module/timer.h |
| 17 | index 6f0cb7f..8807ad5 100644 |
| 18 | --- a/instrumentation/events/lttng-module/timer.h |
| 19 | +++ b/instrumentation/events/lttng-module/timer.h |
| 20 | @@ -44,7 +44,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(timer_class, timer_init, |
| 21 | TP_ARGS(timer) |
| 22 | ) |
| 23 | |
| 24 | -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) |
| 25 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) || \ |
| 26 | + LTTNG_RHEL_KERNEL_RANGE(3,10,0,957,0,0, 3,11,0,0,0,0)) |
| 27 | /** |
| 28 | * timer_start - called when the timer is started |
| 29 | * @timer: pointer to struct timer_list |
| 30 | -- |
| 31 | 2.19.1 |
| 32 | |