diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2011-01-05 06:47:32 -0500 |
---|---|---|
committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2011-01-05 06:47:25 -0500 |
commit | 3fe22f6bfd6f81aafd140d69578d3a2c39674664 (patch) | |
tree | 299ea61e404e827d67b4b834bb0c189c631af62b | |
parent | 12fae5858cd97181c92472c9bb5f098a7eca2ffe (diff) |
[S390] 3270: add support for irq statistics
Add support for 3270 I/O interrupt statistics in /proc/interrupts.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r-- | arch/s390/include/asm/irq.h | 1 | ||||
-rw-r--r-- | arch/s390/kernel/irq.c | 1 | ||||
-rw-r--r-- | drivers/s390/char/raw3270.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h index d52533df6ac8..65e63c02b0f9 100644 --- a/arch/s390/include/asm/irq.h +++ b/arch/s390/include/asm/irq.h | |||
@@ -19,6 +19,7 @@ enum interruption_class { | |||
19 | IOINT_QDI, | 19 | IOINT_QDI, |
20 | IOINT_DAS, | 20 | IOINT_DAS, |
21 | IOINT_C15, | 21 | IOINT_C15, |
22 | IOINT_C70, | ||
22 | NMI_NMI, | 23 | NMI_NMI, |
23 | NR_IRQS, | 24 | NR_IRQS, |
24 | }; | 25 | }; |
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c index e7914e4adc48..8c241416576f 100644 --- a/arch/s390/kernel/irq.c +++ b/arch/s390/kernel/irq.c | |||
@@ -36,6 +36,7 @@ static const struct irq_class intrclass_names[] = { | |||
36 | {.name = "QDI", .desc = "[I/O] QDIO Interrupt" }, | 36 | {.name = "QDI", .desc = "[I/O] QDIO Interrupt" }, |
37 | {.name = "DAS", .desc = "[I/O] DASD" }, | 37 | {.name = "DAS", .desc = "[I/O] DASD" }, |
38 | {.name = "C15", .desc = "[I/O] 3215" }, | 38 | {.name = "C15", .desc = "[I/O] 3215" }, |
39 | {.name = "C70", .desc = "[I/O] 3270" }, | ||
39 | {.name = "NMI", .desc = "[NMI] Machine Check" }, | 40 | {.name = "NMI", .desc = "[NMI] Machine Check" }, |
40 | }; | 41 | }; |
41 | 42 | ||
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c index 2a4c566456e7..96ba2fd1c8ad 100644 --- a/drivers/s390/char/raw3270.c +++ b/drivers/s390/char/raw3270.c | |||
@@ -7,6 +7,7 @@ | |||
7 | * Copyright IBM Corp. 2003, 2009 | 7 | * Copyright IBM Corp. 2003, 2009 |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/kernel_stat.h> | ||
10 | #include <linux/module.h> | 11 | #include <linux/module.h> |
11 | #include <linux/err.h> | 12 | #include <linux/err.h> |
12 | #include <linux/init.h> | 13 | #include <linux/init.h> |
@@ -329,6 +330,7 @@ raw3270_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb) | |||
329 | struct raw3270_request *rq; | 330 | struct raw3270_request *rq; |
330 | int rc; | 331 | int rc; |
331 | 332 | ||
333 | kstat_cpu(smp_processor_id()).irqs[IOINT_C70]++; | ||
332 | rp = dev_get_drvdata(&cdev->dev); | 334 | rp = dev_get_drvdata(&cdev->dev); |
333 | if (!rp) | 335 | if (!rp) |
334 | return; | 336 | return; |