From 519ca67067c35136dcf8e8f6cc2620106a86e072 Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Tue, 28 Aug 2012 16:48:47 +0200
Subject: [PATCH] --- yaml --- r: 324069 b: refs/heads/master c:
 2e73c2cf78f797f3ff299ca39b210bceb40ab804 h: refs/heads/master i:   324067:
 ca42ab1c4d4a047ce2e9f08286469f2678b4cef2 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/s390/include/asm/irq.h | 1 +
 trunk/arch/s390/kernel/irq.c      | 1 +
 trunk/drivers/s390/cio/eadm_sch.c | 3 +++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d53784e58c2a..df3e3badac15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eadb86ab80545d04a0ee576e92ba4447621cdb02
+refs/heads/master: 2e73c2cf78f797f3ff299ca39b210bceb40ab804
diff --git a/trunk/arch/s390/include/asm/irq.h b/trunk/arch/s390/include/asm/irq.h
index 2b9d41899d21..33cc59071581 100644
--- a/trunk/arch/s390/include/asm/irq.h
+++ b/trunk/arch/s390/include/asm/irq.h
@@ -30,6 +30,7 @@ enum interruption_class {
 	IOINT_CLW,
 	IOINT_CTC,
 	IOINT_APB,
+	IOINT_ADM,
 	IOINT_CSC,
 	NMI_NMI,
 	NR_IRQS,
diff --git a/trunk/arch/s390/kernel/irq.c b/trunk/arch/s390/kernel/irq.c
index dd7630d8aab7..a22fdca6a663 100644
--- a/trunk/arch/s390/kernel/irq.c
+++ b/trunk/arch/s390/kernel/irq.c
@@ -55,6 +55,7 @@ static const struct irq_class intrclass_names[] = {
 	{.name = "CLW", .desc = "[I/O] CLAW" },
 	{.name = "CTC", .desc = "[I/O] CTC" },
 	{.name = "APB", .desc = "[I/O] AP Bus" },
+	{.name = "ADM", .desc = "[I/O] EADM Subchannel" },
 	{.name = "CSC", .desc = "[I/O] CHSC Subchannel" },
 	{.name = "NMI", .desc = "[NMI] Machine Check" },
 };
diff --git a/trunk/drivers/s390/cio/eadm_sch.c b/trunk/drivers/s390/cio/eadm_sch.c
index 3fc882f66689..6c9673400464 100644
--- a/trunk/drivers/s390/cio/eadm_sch.c
+++ b/trunk/drivers/s390/cio/eadm_sch.c
@@ -5,6 +5,7 @@
  * Author(s): Sebastian Ott <sebott@linux.vnet.ibm.com>
  */
 
+#include <linux/kernel_stat.h>
 #include <linux/workqueue.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
@@ -138,6 +139,8 @@ static void eadm_subchannel_irq(struct subchannel *sch)
 	EADM_LOG(6, "irq");
 	EADM_LOG_HEX(6, irb, sizeof(*irb));
 
+	kstat_cpu(smp_processor_id()).irqs[IOINT_ADM]++;
+
 	if ((scsw->stctl & (SCSW_STCTL_ALERT_STATUS | SCSW_STCTL_STATUS_PEND))
 	    && scsw->eswf == 1 && irb->esw.eadm.erw.r)
 		error = -EIO;