X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Ftimer.h;h=2fc280c11b8d2ae30aafef2003e073f6279c585d;hb=HEAD;hp=b4c6e945b60fc999c13260a2bdebca809ae917d1;hpb=9f5c9fe5f6bd4c5e8a60f4158b2d6a17fd195b60;p=lttng-modules.git

diff --git a/include/instrumentation/events/timer.h b/include/instrumentation/events/timer.h
index b4c6e945..2fc280c1 100644
--- a/include/instrumentation/events/timer.h
+++ b/include/instrumentation/events/timer.h
@@ -77,8 +77,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(timer_class, timer_init,
 	TP_ARGS(timer)
 )
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0) || \
-	LTTNG_RHEL_KERNEL_RANGE(3,10,0,957,0,0, 3,11,0,0,0,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
 /**
  * timer_start - called when the timer is started
  * @timer:	pointer to struct timer_list
@@ -87,41 +86,45 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(timer_class, timer_init,
  */
 LTTNG_TRACEPOINT_EVENT(timer_start,
 
-	TP_PROTO(struct timer_list *timer, unsigned long expires,
-		unsigned int flags),
+	TP_PROTO(struct timer_list *timer, unsigned long bucket_expiry),
 
-	TP_ARGS(timer, expires, flags),
+	TP_ARGS(timer, bucket_expiry),
 
 	TP_FIELDS(
 		ctf_integer_hex(void *, timer, timer)
 		ctf_integer_hex(void *, function, timer->function)
-		ctf_integer(unsigned long, expires, expires)
+		ctf_integer(unsigned long, expires, timer->expires)
+		ctf_integer(unsigned long, bucket_expiry, bucket_expiry)
 		ctf_integer(unsigned long, now, jiffies)
-		ctf_integer(unsigned int, flags, flags)
+		ctf_integer(unsigned int, flags, timer->flags)
 	)
 )
-#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0)) */
+#else
 /**
  * timer_start - called when the timer is started
  * @timer:	pointer to struct timer_list
  * @expires:	the timers expiry time
+ * @flags:	the timers expiry time
  */
 LTTNG_TRACEPOINT_EVENT(timer_start,
 
-	TP_PROTO(struct timer_list *timer, unsigned long expires),
+	TP_PROTO(struct timer_list *timer, unsigned long expires,
+		unsigned int flags),
 
-	TP_ARGS(timer, expires),
+	TP_ARGS(timer, expires, flags),
 
 	TP_FIELDS(
 		ctf_integer_hex(void *, timer, timer)
 		ctf_integer_hex(void *, function, timer->function)
 		ctf_integer(unsigned long, expires, expires)
 		ctf_integer(unsigned long, now, jiffies)
+		ctf_integer(unsigned int, flags, flags)
 	)
 )
-#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0)) */
+#endif
 
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,2,0) || \
+	LTTNG_KERNEL_RANGE(4,19,312, 4,20,0) || \
 	LTTNG_RHEL_KERNEL_RANGE(4,18,0,193,0,0, 4,19,0,0,0,0))
 /**
  * timer_expire_entry - called immediately before the timer callback