From a8ce171df2d96344f31c2e9f47e9ce0ba7a25252 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 5 Jan 2011 12:47:32 +0100
Subject: [PATCH] --- yaml --- r: 227244 b: refs/heads/master c:
 3fe22f6bfd6f81aafd140d69578d3a2c39674664 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index de6a9d52a92a..7c2cc1671540 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12fae5858cd97181c92472c9bb5f098a7eca2ffe
+refs/heads/master: 3fe22f6bfd6f81aafd140d69578d3a2c39674664
diff --git a/trunk/arch/s390/include/asm/irq.h b/trunk/arch/s390/include/asm/irq.h
index d52533df6ac8..65e63c02b0f9 100644
--- a/trunk/arch/s390/include/asm/irq.h
+++ b/trunk/arch/s390/include/asm/irq.h
@@ -19,6 +19,7 @@ enum interruption_class {
 	IOINT_QDI,
 	IOINT_DAS,
 	IOINT_C15,
+	IOINT_C70,
 	NMI_NMI,
 	NR_IRQS,
 };
diff --git a/trunk/arch/s390/kernel/irq.c b/trunk/arch/s390/kernel/irq.c
index e7914e4adc48..8c241416576f 100644
--- a/trunk/arch/s390/kernel/irq.c
+++ b/trunk/arch/s390/kernel/irq.c
@@ -36,6 +36,7 @@ static const struct irq_class intrclass_names[] = {
 	{.name = "QDI", .desc = "[I/O] QDIO Interrupt" },
 	{.name = "DAS", .desc = "[I/O] DASD" },
 	{.name = "C15", .desc = "[I/O] 3215" },
+	{.name = "C70", .desc = "[I/O] 3270" },
 	{.name = "NMI", .desc = "[NMI] Machine Check" },
 };
 
diff --git a/trunk/drivers/s390/char/raw3270.c b/trunk/drivers/s390/char/raw3270.c
index 2a4c566456e7..96ba2fd1c8ad 100644
--- a/trunk/drivers/s390/char/raw3270.c
+++ b/trunk/drivers/s390/char/raw3270.c
@@ -7,6 +7,7 @@
  *     Copyright IBM Corp. 2003, 2009
  */
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/init.h>
@@ -329,6 +330,7 @@ raw3270_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
 	struct raw3270_request *rq;
 	int rc;
 
+	kstat_cpu(smp_processor_id()).irqs[IOINT_C70]++;
 	rp = dev_get_drvdata(&cdev->dev);
 	if (!rp)
 		return;