tracing: remove redundant SOFTIRQ from softirq event traces

After converting the softirq tracer to use te flags options, this
caused a regression with the name. Since the flag was used directly
it was printed out (i.e. HRTIMER_SOFTIRQ).

This patch only shows the softirq name without the SOFTIRQ part.

[ Impact: fix regression of output from softirq events ]

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
index 683fb36a9943edc09e253e68bdafd5251743e4b0..b0c7ede55eb156c0d4880dee2555dc4b35577887 100644 (file)
--- a/include/trace/events/irq.h
+++ b/include/trace/events/irq.h
@@ -7,18 +7,18 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM irq
 
-#define softirq_name(sirq) { sirq, #sirq }
-#define show_softirq_name(val)                                         \
-       __print_symbolic(val,                                           \
-                        softirq_name(HI_SOFTIRQ),                      \
-                        softirq_name(TIMER_SOFTIRQ),                   \
-                        softirq_name(NET_TX_SOFTIRQ),                  \
-                        softirq_name(NET_RX_SOFTIRQ),                  \
-                        softirq_name(BLOCK_SOFTIRQ),                   \
-                        softirq_name(TASKLET_SOFTIRQ),                 \
-                        softirq_name(SCHED_SOFTIRQ),                   \
-                        softirq_name(HRTIMER_SOFTIRQ),                 \
-                        softirq_name(RCU_SOFTIRQ))
+#define softirq_name(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(TASKLET), \
+                        softirq_name(SCHED),   \
+                        softirq_name(HRTIMER), \
+                        softirq_name(RCU))
 
 /**
  * irq_handler_entry - called immediately before the irq action handler