X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=instrumentation%2Fevents%2Flttng-module%2Frcu.h;h=1220fb726b36f45eaee1ca81326c800272373f87;hb=13ab8b0a749053960f81a4924a3ed27775518f94;hp=8392946a74d3da24147a8ae1bd2356634be682df;hpb=a828b9d550419db8ff9594e3a983b541521739ed;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/rcu.h b/instrumentation/events/lttng-module/rcu.h
index 8392946a..1220fb72 100644
--- a/instrumentation/events/lttng-module/rcu.h
+++ b/instrumentation/events/lttng-module/rcu.h
@@ -20,7 +20,11 @@
  */
 TRACE_EVENT(rcu_utilization,
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
+	TP_PROTO(const char *s),
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */
 	TP_PROTO(char *s),
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */
 
 	TP_ARGS(s),
 
@@ -443,7 +447,11 @@ TRACE_EVENT(rcu_kfree_callback,
  */
 TRACE_EVENT(rcu_batch_start,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
+	TP_PROTO(char *rcuname, long qlen_lazy, long qlen, long blimit),
+
+	TP_ARGS(rcuname, qlen_lazy, qlen, blimit),
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
 	TP_PROTO(char *rcuname, long qlen_lazy, long qlen, int blimit),
 
 	TP_ARGS(rcuname, qlen_lazy, qlen, blimit),
@@ -459,7 +467,11 @@ TRACE_EVENT(rcu_batch_start,
 		__field(long, qlen_lazy)
 #endif
 		__field(long, qlen)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
+		__field(long, blimit)
+#else
 		__field(int, blimit)
+#endif
 	),
 
 	TP_fast_assign(
@@ -471,7 +483,11 @@ TRACE_EVENT(rcu_batch_start,
 		tp_assign(blimit, blimit)
 	),
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
+	TP_printk("%s CBs=%ld/%ld bl=%ld",
+		  __get_str(rcuname), __entry->qlen_lazy, __entry->qlen,
+		  __entry->blimit)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
 	TP_printk("%s CBs=%ld/%ld bl=%d",
 		  __get_str(rcuname), __entry->qlen_lazy, __entry->qlen,
 		  __entry->blimit)