---

yaml --- r: 227243 b: refs/heads/master c: 12fae58 h: refs/heads/master i: 227241: ba89826 227239: c9da1a2 v: v3
git-mirror · Jan 5, 2011 · 36e1a18 · 36e1a18
1 parent a33c259
commit 36e1a18
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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;