diff options
author | Holger Dengler <hd@linux.vnet.ibm.com> | 2011-01-05 06:47:38 -0500 |
---|---|---|
committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2011-01-05 06:47:26 -0500 |
commit | 62d146ffe3adfed2747fc36138476c8417ce73a7 (patch) | |
tree | d5d27798a98fc7683e092ffb4a6cc208a64fb90a | |
parent | 85b81cdd0b038d580dedf6289df7de65826967d6 (diff) |
[S390] ap bus: add support for irq statistics
Add support for AP Bus I/O interrupt statistics in /proc/interrupts.
Signed-off-by: Holger Dengler <hd@linux.vnet.ibm.com>
Signed-off-by: Felix Beck <felix.beck@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/crypto/ap_bus.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 8c79f9400a36..db14a311f1d2 100644 --- a/arch/s390/include/asm/irq.h +++ b/arch/s390/include/asm/irq.h | |||
@@ -25,6 +25,7 @@ enum interruption_class { | |||
25 | IOINT_LCS, | 25 | IOINT_LCS, |
26 | IOINT_CLW, | 26 | IOINT_CLW, |
27 | IOINT_CTC, | 27 | IOINT_CTC, |
28 | IOINT_APB, | ||
28 | NMI_NMI, | 29 | NMI_NMI, |
29 | NR_IRQS, | 30 | NR_IRQS, |
30 | }; | 31 | }; |
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c index 57ed2b55c2a1..ea5099c9709c 100644 --- a/arch/s390/kernel/irq.c +++ b/arch/s390/kernel/irq.c | |||
@@ -42,6 +42,7 @@ static const struct irq_class intrclass_names[] = { | |||
42 | {.name = "LCS", .desc = "[I/O] LCS" }, | 42 | {.name = "LCS", .desc = "[I/O] LCS" }, |
43 | {.name = "CLW", .desc = "[I/O] CLAW" }, | 43 | {.name = "CLW", .desc = "[I/O] CLAW" }, |
44 | {.name = "CTC", .desc = "[I/O] CTC" }, | 44 | {.name = "CTC", .desc = "[I/O] CTC" }, |
45 | {.name = "APB", .desc = "[I/O] AP Bus" }, | ||
45 | {.name = "NMI", .desc = "[NMI] Machine Check" }, | 46 | {.name = "NMI", .desc = "[NMI] Machine Check" }, |
46 | }; | 47 | }; |
47 | 48 | ||
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index a1ba52a09602..4f37c45ee114 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #define KMSG_COMPONENT "ap" | 27 | #define KMSG_COMPONENT "ap" |
28 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 28 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
29 | 29 | ||
30 | #include <linux/kernel_stat.h> | ||
30 | #include <linux/module.h> | 31 | #include <linux/module.h> |
31 | #include <linux/init.h> | 32 | #include <linux/init.h> |
32 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
@@ -1042,6 +1043,7 @@ out: | |||
1042 | 1043 | ||
1043 | static void ap_interrupt_handler(void *unused1, void *unused2) | 1044 | static void ap_interrupt_handler(void *unused1, void *unused2) |
1044 | { | 1045 | { |
1046 | kstat_cpu(smp_processor_id()).irqs[IOINT_APB]++; | ||
1045 | tasklet_schedule(&ap_tasklet); | 1047 | tasklet_schedule(&ap_tasklet); |
1046 | } | 1048 | } |
1047 | 1049 | ||