1 files changed, 15 insertions, 4 deletions

diff --git a/include/trace/irq_event_types.h b/include/trace/irq_event_types.h
index 47a2be1b2d7..65850bc5ea0 100644
--- a/include/trace/irq_event_types.h
+++ b/include/trace/irq_event_types.h
@@ -8,15 +8,26 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM irq
 
-TRACE_FORMAT(irq_handler_entry,
+TRACE_EVENT_FORMAT(irq_handler_entry,
         TPPROTO(int irq, struct irqaction *action),
         TPARGS(irq, action),
-        TPFMT("irq=%d handler=%s", irq, action->name));
+        TPFMT("irq=%d handler=%s", irq, action->name),
+        TRACE_STRUCT(
+                TRACE_FIELD(int, irq, irq)
+        ),
+        TPRAWFMT("irq %d")
+        );
 
-TRACE_FORMAT(irq_handler_exit,
+TRACE_EVENT_FORMAT(irq_handler_exit,
         TPPROTO(int irq, struct irqaction *action, int ret),
         TPARGS(irq, action, ret),
         TPFMT("irq=%d handler=%s return=%s",
-                irq, action->name, ret ? "handled" : "unhandled"));
+                irq, action->name, ret ? "handled" : "unhandled"),
+        TRACE_STRUCT(
+                TRACE_FIELD(int, irq, irq)
+                TRACE_FIELD(int, ret, ret)
+        ),
+        TPRAWFMT("irq %d ret %d")
+        );
 
 #undef TRACE_SYSTEM