From 7252df9c4b9d48675e397546f0826857eea2e435 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 5 Jan 2011 12:47:35 +0100
Subject: [PATCH] --- yaml --- r: 227247 b: refs/heads/master c:
 096a61682e86090e4e74118ff6fa6858ca73aa58 h: refs/heads/master i:   227245:
 5cc29e00a53a78b0699109e2f67abf4456db4bb4   227243:
 36e1a186e6b1effba1a90f429f20bb3f157463b2   227239:
 c9da1a28e5fdf51651ff143162c7a6408f24a1a0   227231:
 b798586563dfd074ecdf292bd96db91c6ea34db8 v: v3

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

diff --git a/[refs] b/[refs]
index efadd446c411..27091470cb38 100644
--- 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
index 6c9b55681eab..6a455b8ea18b 100644
--- 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
index ae726d1ae430..4c6e071b7f92 100644
--- 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
index 0f19d540b655..0bf708944314 100644
--- 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;