summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-06-01 12:20:40 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-06-01 23:25:42 -0400
commit1d080d6c3141623c92caaebe20e847cb99ccbb60 (patch)
treee77559ff0edc3bfaf228a0e4e7c26ca3cf720de8
parentec081ddc3d90aab35bc0de19a358b964978837cf (diff)
downloadlinux-stable-1d080d6c3141623c92caaebe20e847cb99ccbb60.tar.gz
linux-stable-1d080d6c3141623c92caaebe20e847cb99ccbb60.tar.bz2
linux-stable-1d080d6c3141623c92caaebe20e847cb99ccbb60.zip
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>
-rw-r--r--include/trace/events/irq.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
index 683fb36a9943..b0c7ede55eb1 100644
--- 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