From e601a6e1680891df1b513fc7620fa2a85b660117 Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Sun, 30 Oct 2011 15:16:54 +0100
Subject: [PATCH] --- yaml --- r: 272073 b: refs/heads/master c:
 65b4e403ac926f5196c2f28c4ec783d32dc322f0 h: refs/heads/master i:   272071:
 8a3ef2a0c5598ebbbfb73b716e2425936e6851e6 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/s390/include/asm/irq.h | 1 +
 trunk/arch/s390/kernel/irq.c      | 1 +
 trunk/drivers/s390/cio/chsc_sch.c | 5 ++++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bdf952f80733..b23b2a257770 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dad572e370138539ea45be9b53d168568e562565
+refs/heads/master: 65b4e403ac926f5196c2f28c4ec783d32dc322f0
diff --git a/trunk/arch/s390/include/asm/irq.h b/trunk/arch/s390/include/asm/irq.h
index 1f686059f293..eadfa9fc03ba 100644
--- a/trunk/arch/s390/include/asm/irq.h
+++ b/trunk/arch/s390/include/asm/irq.h
@@ -28,6 +28,7 @@ enum interruption_class {
 	IOINT_CLW,
 	IOINT_CTC,
 	IOINT_APB,
+	IOINT_CSC,
 	NMI_NMI,
 	NR_IRQS,
 };
diff --git a/trunk/arch/s390/kernel/irq.c b/trunk/arch/s390/kernel/irq.c
index d382f9db3df5..30faaef34457 100644
--- a/trunk/arch/s390/kernel/irq.c
+++ b/trunk/arch/s390/kernel/irq.c
@@ -53,6 +53,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 = "CSC", .desc = "[I/O] CHSC Subchannel" },
 	{.name = "NMI", .desc = "[NMI] Machine Check" },
 };
 
diff --git a/trunk/drivers/s390/cio/chsc_sch.c b/trunk/drivers/s390/cio/chsc_sch.c
index e950f1ad4dd1..0c87b0fc7714 100644
--- a/trunk/drivers/s390/cio/chsc_sch.c
+++ b/trunk/drivers/s390/cio/chsc_sch.c
@@ -1,7 +1,7 @@
 /*
  * Driver for s390 chsc subchannels
  *
- * Copyright IBM Corp. 2008, 2009
+ * Copyright IBM Corp. 2008, 2011
  *
  * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
  *
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/uaccess.h>
 #include <linux/miscdevice.h>
+#include <linux/kernel_stat.h>
 
 #include <asm/compat.h>
 #include <asm/cio.h>
@@ -56,6 +57,8 @@ static void chsc_subchannel_irq(struct subchannel *sch)
 
 	CHSC_LOG(4, "irb");
 	CHSC_LOG_HEX(4, irb, sizeof(*irb));
+	kstat_cpu(smp_processor_id()).irqs[IOINT_CSC]++;
+
 	/* Copy irb to provided request and set done. */
 	if (!request) {
 		CHSC_MSG(0, "Interrupt on sch 0.%x.%04x with no request\n",