instrumentation: workqueue: remove compatibility code

[lttng-modules.git] / instrumentation / events / lttng-module / workqueue.h

diff --git a/instrumentation/events/lttng-module/workqueue.h b/instrumentation/events/lttng-module/workqueue.h
index e0ef9178d8b4e3347e582f4985554759eb0ae7c2..c33dd3b12d3432730c114902c18667f308b101f9 100644 (file)
--- a/instrumentation/events/lttng-module/workqueue.h
+++ b/instrumentation/events/lttng-module/workqueue.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM workqueue
 
@@ -7,7 +7,6 @@
 
 #include <probes/lttng-tracepoint-event.h>
 #include <linux/workqueue.h>
-#include <linux/version.h>
 
 #ifndef _TRACE_WORKQUEUE_DEF_
 #define _TRACE_WORKQUEUE_DEF_
@@ -40,17 +39,10 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work,
  */
 LTTNG_TRACEPOINT_EVENT(workqueue_queue_work,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
        TP_PROTO(unsigned int req_cpu, struct pool_workqueue *pwq,
                 struct work_struct *work),
 
        TP_ARGS(req_cpu, pwq, work),
-#else
-       TP_PROTO(unsigned int req_cpu, struct cpu_workqueue_struct *cwq,
-                struct work_struct *work),
-
-       TP_ARGS(req_cpu, cwq, work),
-#endif
 
        TP_FIELDS(
                ctf_integer_hex(void *, work, work)
@@ -95,14 +87,20 @@ LTTNG_TRACEPOINT_EVENT(workqueue_execute_start,
 /**
  * workqueue_execute_end - called immediately after the workqueue callback
  * @work:      pointer to struct work_struct
+ * @function:  pointer to worker function
  *
  * Allows to track workqueue execution.
  */
-LTTNG_TRACEPOINT_EVENT_INSTANCE(workqueue_work, workqueue_execute_end,
+LTTNG_TRACEPOINT_EVENT(workqueue_execute_end,
 
-       TP_PROTO(struct work_struct *work),
+       TP_PROTO(struct work_struct *work, work_func_t function),
 
-       TP_ARGS(work)
+       TP_ARGS(work, function),
+
+       TP_FIELDS(
+               ctf_integer_hex(void *, work, work)
+               ctf_integer_hex(void *, function, function)
+       )
 )
 
 #endif /*  LTTNG_TRACE_WORKQUEUE_H */