---

yaml --- r: 227245 b: refs/heads/master c: b866517 h: refs/heads/master i: 227243: 36e1a18 v: v3
git-mirror · Jan 5, 2011 · 5cc29e0 · 5cc29e0
1 parent a8ce171
commit 5cc29e0
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: 3fe22f6bfd6f81aafd140d69578d3a2c39674664
+refs/heads/master: b86651721f18f40319efe94ed3eac2d26682e5b9
diff --git a/trunk/arch/s390/include/asm/irq.h b/trunk/arch/s390/include/asm/irq.h
@@ -20,6 +20,7 @@ enum interruption_class {
 	IOINT_DAS,
 	IOINT_C15,
 	IOINT_C70,
+	IOINT_TAP,
 	NMI_NMI,
 	NR_IRQS,
 };

diff --git a/trunk/arch/s390/kernel/irq.c b/trunk/arch/s390/kernel/irq.c
@@ -37,6 +37,7 @@ static const struct irq_class intrclass_names[] = {
 	{.name = "DAS", .desc = "[I/O] DASD" },
 	{.name = "C15", .desc = "[I/O] 3215" },
 	{.name = "C70", .desc = "[I/O] 3270" },
+	{.name = "TAP", .desc = "[I/O] Tape" },
 	{.name = "NMI", .desc = "[NMI] Machine Check" },
 };
 

diff --git a/trunk/drivers/s390/char/tape_core.c b/trunk/drivers/s390/char/tape_core.c
@@ -14,6 +14,7 @@
 #define KMSG_COMPONENT "tape"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/init.h>	     // for kernel parameters
 #include <linux/kmod.h>	     // for requesting modules
@@ -1114,6 +1115,7 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
 	struct tape_request *request;
 	int rc;
 
+	kstat_cpu(smp_processor_id()).irqs[IOINT_TAP]++;
 	device = dev_get_drvdata(&cdev->dev);
 	if (device == NULL) {
 		return;