1 files changed, 27 insertions, 12 deletions

diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
index 3608bebd3d9c..ff8f6c091a15 100644
--- a/include/trace/events/irq.h
+++ b/include/trace/events/irq.h
@@ -9,19 +9,34 @@
 struct irqaction;
 struct softirq_action;
 
-#define softirq_name(sirq) { sirq##_SOFTIRQ, #sirq }
+#define SOFTIRQ_NAME_LIST                               \
+                         softirq_name(HI)               \
+                         softirq_name(TIMER)            \
+                         softirq_name(NET_TX)           \
+                         softirq_name(NET_RX)           \
+                         softirq_name(BLOCK)            \
+                         softirq_name(BLOCK_IOPOLL)     \
+                         softirq_name(TASKLET)          \
+                         softirq_name(SCHED)            \
+                         softirq_name(HRTIMER)          \
+                         softirq_name_end(RCU)
+
+#undef softirq_name
+#undef softirq_name_end
+
+#define softirq_name(sirq) TRACE_DEFINE_ENUM(sirq##_SOFTIRQ);
+#define softirq_name_end(sirq)  TRACE_DEFINE_ENUM(sirq##_SOFTIRQ);
+
+SOFTIRQ_NAME_LIST
+
+#undef softirq_name
+#undef softirq_name_end
+
+#define softirq_name(sirq) { sirq##_SOFTIRQ, #sirq },
+#define softirq_name_end(sirq) { sirq##_SOFTIRQ, #sirq }
+
 #define show_softirq_name(val)                          \
-        __print_symbolic(val,                           \
-                         softirq_name(HI),              \
-                         softirq_name(TIMER),           \
-                         softirq_name(NET_TX),          \
-                         softirq_name(NET_RX),          \
-                         softirq_name(BLOCK),           \
-                         softirq_name(BLOCK_IOPOLL),    \
-                         softirq_name(TASKLET),         \
-                         softirq_name(SCHED),           \
-                         softirq_name(HRTIMER),         \
-                         softirq_name(RCU))
+        __print_symbolic(val, SOFTIRQ_NAME_LIST)
 
 /**
  * irq_handler_entry - called immediately before the irq action handler