From a1a5a236a131601dffffdfb9340be95e28f50bef Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Thu, 17 Sep 2009 17:38:32 +0800
Subject: [PATCH] --- yaml --- r: 162983 b: refs/heads/master c:
 5dd4de587fd9c25cb32a7a0fe9feec3647509b6f h: refs/heads/master i:   162981:
 f989100dc9702a9d8d9705dbcc0a56296db197a1   162979:
 0361ec3e9efa96540031f6086f756cf782aae983   162975:
 4ca5754588088e91813bdc522e65769db241f3bf v: v3

---
 [refs]                           |  2 +-
 trunk/include/trace/events/irq.h | 21 +++++++++++----------
 trunk/kernel/softirq.c           |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 35accd83e63b..87dda3e5172e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a5963eb494c8a7be65199e15854551df7d2d939
+refs/heads/master: 5dd4de587fd9c25cb32a7a0fe9feec3647509b6f
diff --git a/trunk/include/trace/events/irq.h b/trunk/include/trace/events/irq.h
index 1cb0c3aa11e6..b89f9db4a404 100644
--- a/trunk/include/trace/events/irq.h
+++ b/trunk/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/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
index 7db25067cd2d..f8749e5216e0 100644
--- a/trunk/kernel/softirq.c
+++ b/trunk/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"
 };