From: Mathieu Desnoyers Date: Sun, 28 Dec 2014 14:05:51 +0000 (-0500) Subject: Fix: update rcu instrumentation for 3.19+ kernels X-Git-Tag: v2.6.0~4 X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=commitdiff_plain;h=4946140090b2fb2a4c0e441f89c0f34d5bbf07ed Fix: update rcu instrumentation for 3.19+ kernels Signed-off-by: Mathieu Desnoyers --- diff --git a/instrumentation/events/lttng-module/rcu.h b/instrumentation/events/lttng-module/rcu.h index 42b2004c..16993aa3 100644 --- a/instrumentation/events/lttng-module/rcu.h +++ b/instrumentation/events/lttng-module/rcu.h @@ -41,7 +41,10 @@ LTTNG_TRACEPOINT_EVENT(rcu_utilization, #ifdef CONFIG_RCU_TRACE -#if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU) +#if defined(CONFIG_TREE_RCU) \ + || (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) \ + && defined(CONFIG_PREEMPT_RCU)) \ + || defined(CONFIG_TREE_PREEMPT_RCU) /* * Tracepoint for grace-period events: starting and ending a grace @@ -269,7 +272,12 @@ LTTNG_TRACEPOINT_EVENT(rcu_fqs, __entry->cpu, __get_str(qsevent)) ) -#endif /* #if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU) */ +#endif /* + * #if defined(CONFIG_TREE_RCU) + * || (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) + * && defined(CONFIG_PREEMPT_RCU)) + * || defined(CONFIG_TREE_PREEMPT_RCU) + */ /* * Tracepoint for dyntick-idle entry/exit events. These take a string