---

yaml --- r: 227247 b: refs/heads/master c: 096a616 h: refs/heads/master i: 227245: 5cc29e0 227243: 36e1a18 227239: c9da1a2 227231: b798586 v: v3
git-mirror · Jan 5, 2011 · 7252df9 · 7252df9
1 parent 82d5c09
commit 7252df9
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: f48198d592b0d680b9677bd69edd2290cd0c1f4f
+refs/heads/master: 096a61682e86090e4e74118ff6fa6858ca73aa58
diff --git a/trunk/arch/s390/include/asm/irq.h b/trunk/arch/s390/include/asm/irq.h
@@ -22,6 +22,7 @@ enum interruption_class {
 	IOINT_C70,
 	IOINT_TAP,
 	IOINT_VMR,
+	IOINT_LCS,
 	NMI_NMI,
 	NR_IRQS,
 };

diff --git a/trunk/arch/s390/kernel/irq.c b/trunk/arch/s390/kernel/irq.c
@@ -39,6 +39,7 @@ static const struct irq_class intrclass_names[] = {
 	{.name = "C70", .desc = "[I/O] 3270" },
 	{.name = "TAP", .desc = "[I/O] Tape" },
 	{.name = "VMR", .desc = "[I/O] Unit Record Devices" },
+	{.name = "LCS", .desc = "[I/O] LCS" },
 	{.name = "NMI", .desc = "[NMI] Machine Check" },
 };
 

diff --git a/trunk/drivers/s390/net/lcs.c b/trunk/drivers/s390/net/lcs.c
@@ -26,6 +26,7 @@
 #define KMSG_COMPONENT		"lcs"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/if.h>
 #include <linux/netdevice.h>
@@ -1396,6 +1397,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
 	int rc, index;
 	int cstat, dstat;
 
+	kstat_cpu(smp_processor_id()).irqs[IOINT_LCS]++;
 	if (lcs_check_irb_error(cdev, irb))
 		return;