Fix: update rcu instrumentation for 3.19+ kernels

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

diff --git a/instrumentation/events/lttng-module/rcu.h b/instrumentation/events/lttng-module/rcu.h
index 42b2004c638fe3a2f8f19429e858fc98a59c77de..16993aa3f4dd51ac36b95c380768eb223c6267ce 100644 (file)
--- 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