2 files changed, 22 insertions, 16 deletions

diff --git a/include/trace/events/workqueue.h b/include/trace/events/workqueue.h
index 49682d7e9d60..ec9d7244eb9f 100644
--- a/include/trace/events/workqueue.h
+++ b/include/trace/events/workqueue.h
@@ -7,13 +7,7 @@
 #include <linux/tracepoint.h>
 #include <linux/workqueue.h>
 
-/**
- * workqueue_execute_start - called immediately before the workqueue callback
- * @work:       pointer to struct work_struct
- *
- * Allows to track workqueue execution.
- */
-TRACE_EVENT(workqueue_execute_start,
+DECLARE_EVENT_CLASS(workqueue_work,
 
         TP_PROTO(struct work_struct *work),
 
@@ -21,24 +15,22 @@ TRACE_EVENT(workqueue_execute_start,
 
         TP_STRUCT__entry(
                 __field( void *,        work    )
-                __field( void *,        function)
         ),
 
         TP_fast_assign(
                 __entry->work           = work;
-                __entry->function       = work->func;
         ),
 
-        TP_printk("work struct %p: function %pf", __entry->work, __entry->function)
+        TP_printk("work struct %p", __entry->work)
 );
 
 /**
- * workqueue_execute_end - called immediately before the workqueue callback
+ * workqueue_execute_start - called immediately before the workqueue callback
  * @work:       pointer to struct work_struct
  *
  * Allows to track workqueue execution.
  */
-TRACE_EVENT(workqueue_execute_end,
+TRACE_EVENT(workqueue_execute_start,
 
         TP_PROTO(struct work_struct *work),
 
@@ -46,15 +38,29 @@ TRACE_EVENT(workqueue_execute_end,
 
         TP_STRUCT__entry(
                 __field( void *,        work    )
+                __field( void *,        function)
         ),
 
         TP_fast_assign(
                 __entry->work           = work;
+                __entry->function       = work->func;
         ),
 
-        TP_printk("work struct %p", __entry->work)
+        TP_printk("work struct %p: function %pf", __entry->work, __entry->function)
 );
 
+/**
+ * workqueue_execute_end - called immediately before the workqueue callback
+ * @work:       pointer to struct work_struct
+ *
+ * Allows to track workqueue execution.
+ */
+DEFINE_EVENT(workqueue_work, workqueue_execute_end,
+
+        TP_PROTO(struct work_struct *work),
+
+        TP_ARGS(work)
+);
 
 #endif /*  _TRACE_WORKQUEUE_H */
 
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 19e4bc15ee99..026f778e879b 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -42,9 +42,6 @@
 #include <linux/lockdep.h>
 #include <linux/idr.h>
 
-#define CREATE_TRACE_POINTS
-#include <trace/events/workqueue.h>
-
 #include "workqueue_sched.h"
 
 enum {
@@ -257,6 +254,9 @@ EXPORT_SYMBOL_GPL(system_long_wq);
 EXPORT_SYMBOL_GPL(system_nrt_wq);
 EXPORT_SYMBOL_GPL(system_unbound_wq);
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/workqueue.h>
+
 #define for_each_busy_worker(worker, i, pos, gcwq)                      \
         for (i = 0; i < BUSY_WORKER_HASH_SIZE; i++)                     \
                 hlist_for_each_entry(worker, pos, &gcwq->busy_hash[i], hentry)