From 36e1a186e6b1effba1a90f429f20bb3f157463b2 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 5 Jan 2011 12:47:31 +0100
Subject: [PATCH] --- yaml --- r: 227243 b: refs/heads/master c:
 12fae5858cd97181c92472c9bb5f098a7eca2ffe h: refs/heads/master i:   227241:
 ba89826f5f1931b8f5b0da4b427f021cd477d60b   227239:
 c9da1a28e5fdf51651ff143162c7a6408f24a1a0 v: v3

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

diff --git a/[refs] b/[refs]
index 0e519bb3a48d..de6a9d52a92a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3283942b71eb5023184b378230f5f0e3fbb40991
+refs/heads/master: 12fae5858cd97181c92472c9bb5f098a7eca2ffe
diff --git a/trunk/arch/s390/include/asm/irq.h b/trunk/arch/s390/include/asm/irq.h
index 082ef0cce287..d52533df6ac8 100644
--- a/trunk/arch/s390/include/asm/irq.h
+++ b/trunk/arch/s390/include/asm/irq.h
@@ -18,6 +18,7 @@ enum interruption_class {
 	IOINT_QAI,
 	IOINT_QDI,
 	IOINT_DAS,
+	IOINT_C15,
 	NMI_NMI,
 	NR_IRQS,
 };
diff --git a/trunk/arch/s390/kernel/irq.c b/trunk/arch/s390/kernel/irq.c
index 313fe83a443a..e7914e4adc48 100644
--- a/trunk/arch/s390/kernel/irq.c
+++ b/trunk/arch/s390/kernel/irq.c
@@ -35,6 +35,7 @@ static const struct irq_class intrclass_names[] = {
 	{.name = "QAI", .desc = "[I/O] QDIO Adapter Interrupt" },
 	{.name = "QDI", .desc = "[I/O] QDIO Interrupt" },
 	{.name = "DAS", .desc = "[I/O] DASD" },
+	{.name = "C15", .desc = "[I/O] 3215" },
 	{.name = "NMI", .desc = "[NMI] Machine Check" },
 };
 
diff --git a/trunk/drivers/s390/char/con3215.c b/trunk/drivers/s390/char/con3215.c
index 59ec073724bf..3fb4335d491d 100644
--- a/trunk/drivers/s390/char/con3215.c
+++ b/trunk/drivers/s390/char/con3215.c
@@ -9,6 +9,7 @@
  *	      Dan Morrison, IBM Corporation <dmorriso@cse.buffalo.edu>
  */
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kdev_t.h>
@@ -361,6 +362,7 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
 	int cstat, dstat;
 	int count;
 
+	kstat_cpu(smp_processor_id()).irqs[IOINT_C15]++;
 	raw = dev_get_drvdata(&cdev->dev);
 	req = (struct raw3215_req *) intparm;
 	cstat = irb->scsw.cmd.cstat;