softirq: add BLOCK_IOPOLL to softirq_to_name

With BLOCK_IOPOLL_SOFTIRQ added, softirq_to_name[] and
show_softirq_name() needs to be updated.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4AB20398.8070209@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
index 1cb0c3aa11e613659a0a87cc9c72ea4d14f69a3f..b89f9db4a404eaeb1800d2424eae5bd6e26387d4 100644 (file)
--- a/include/trace/events/irq.h
+++ b/include/trace/events/irq.h
@@ -8,16 +8,17 @@
 #include <linux/interrupt.h>
 
 #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), \
+#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))
 
 /**

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 7db25067cd2dde3018d64bbeed9b085ee8d42d7b..f8749e5216e00c0b1a719a4aa945be8454ca67c0 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -57,7 +57,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
 
 char *softirq_to_name[NR_SOFTIRQS] = {
-       "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK",
+       "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
        "TASKLET", "SCHED", "HRTIMER",  "RCU"
 };