7 files changed, 44 insertions, 19 deletions

diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index 7da991a858f8..f65faf63ab3a 100644
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -1,23 +1,22 @@
 #ifndef _ASM_IRQ_H
 #define _ASM_IRQ_H
 
-#ifdef __KERNEL__
 #include <linux/hardirq.h>
 
-/*
- * the definition of irqs has changed in 2.5.46:
- * NR_IRQS is no longer the number of i/o
- * interrupts (65536), but rather the number
- * of interrupt classes (2).
- * Only external and i/o interrupts make much sense here (CH).
- */
-
 enum interruption_class {
         EXTERNAL_INTERRUPT,
         IO_INTERRUPT,
-
+        EXTINT_CLK,
+        EXTINT_IPI,
+        EXTINT_TMR,
+        EXTINT_TLA,
+        EXTINT_PFL,
+        EXTINT_DSD,
+        EXTINT_VRT,
+        EXTINT_SCP,
+        EXTINT_IUC,
+        NMI_NMI,
         NR_IRQS,
 };
 
-#endif /* __KERNEL__ */
-#endif
+#endif /* _ASM_IRQ_H */
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index 026a37a94fc9..9bd049b8f997 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -1,7 +1,5 @@
 /*
- *  arch/s390/kernel/irq.c
- *
- *    Copyright IBM Corp. 2004,2007
+ *    Copyright IBM Corp. 2004,2010
  *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
  *               Thomas Spatzier (tspat@de.ibm.com)
  *
@@ -17,12 +15,31 @@
 #include <linux/proc_fs.h>
 #include <linux/profile.h>
 
+struct irq_class {
+        char *name;
+        char *desc;
+};
+
+static const struct irq_class intrclass_names[] = {
+        {.name = "EXT" },
+        {.name = "I/O" },
+        {.name = "CLK", .desc = "[EXT] Clock Comparator" },
+        {.name = "IPI", .desc = "[EXT] Signal Processor" },
+        {.name = "TMR", .desc = "[EXT] CPU Timer" },
+        {.name = "TAL", .desc = "[EXT] Timing Alert" },
+        {.name = "PFL", .desc = "[EXT] Pseudo Page Fault" },
+        {.name = "DSD", .desc = "[EXT] DASD Diag" },
+        {.name = "VRT", .desc = "[EXT] Virtio" },
+        {.name = "SCP", .desc = "[EXT] Service Call" },
+        {.name = "IUC", .desc = "[EXT] IUCV" },
+        {.name = "NMI", .desc = "[NMI] Machine Check" },
+};
+
 /*
  * show_interrupts is needed by /proc/interrupts.
  */
 int show_interrupts(struct seq_file *p, void *v)
 {
-        static const char *intrclass_names[] = { "EXT", "I/O", };
         int i = *(loff_t *) v, j;
 
         get_online_cpus();
@@ -34,15 +51,16 @@ int show_interrupts(struct seq_file *p, void *v)
         }
 
         if (i < NR_IRQS) {
-                seq_printf(p, "%s: ", intrclass_names[i]);
+                seq_printf(p, "%s: ", intrclass_names[i].name);
 #ifndef CONFIG_SMP
                 seq_printf(p, "%10u ", kstat_irqs(i));
 #else
                 for_each_online_cpu(j)
                         seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
 #endif
+                if (intrclass_names[i].desc)
+                        seq_printf(p, "  %s", intrclass_names[i].desc);
                 seq_putc(p, '\n');
-
         }
         put_online_cpus();
         return 0;
diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c
index 1995c1712fc8..fab88431a06f 100644
--- a/arch/s390/kernel/nmi.c
+++ b/arch/s390/kernel/nmi.c
@@ -8,6 +8,7 @@
  *               Heiko Carstens <heiko.carstens@de.ibm.com>,
  */
 
+#include <linux/kernel_stat.h>
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/hardirq.h>
@@ -255,7 +256,7 @@ void notrace s390_do_machine_check(struct pt_regs *regs)
         nmi_enter();
         s390_idle_check(regs, S390_lowcore.mcck_clock,
                         S390_lowcore.mcck_enter_timer);
-
+        kstat_cpu(smp_processor_id()).irqs[NMI_NMI]++;
         mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
         mcck = &__get_cpu_var(cpu_mcck);
         umode = user_mode(regs);
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 94cf510b8fe1..a9702df22f3a 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -161,6 +161,7 @@ static void do_ext_call_interrupt(unsigned int ext_int_code,
 {
         unsigned long bits;
 
+        kstat_cpu(smp_processor_id()).irqs[EXTINT_IPI]++;
         /*
          * handle bit signal external calls
          *
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 4c9d72d2e273..9e7b039458da 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -15,6 +15,7 @@
 #define KMSG_COMPONENT "time"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
+#include <linux/kernel_stat.h>
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/sched.h>
@@ -160,6 +161,7 @@ static void clock_comparator_interrupt(unsigned int ext_int_code,
                                        unsigned int param32,
                                        unsigned long param64)
 {
+        kstat_cpu(smp_processor_id()).irqs[EXTINT_CLK]++;
         if (S390_lowcore.clock_comparator == -1ULL)
                 set_clock_comparator(S390_lowcore.clock_comparator);
 }
@@ -170,6 +172,7 @@ static void stp_timing_alert(struct stp_irq_parm *);
 static void timing_alert_interrupt(unsigned int ext_int_code,
                                    unsigned int param32, unsigned long param64)
 {
+        kstat_cpu(smp_processor_id()).irqs[EXTINT_TLA]++;
         if (param32 & 0x00c40000)
                 etr_timing_alert((struct etr_irq_parm *) &param32);
         if (param32 & 0x00038000)
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 8636dd00e393..1ccdf4d8aa85 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -324,6 +324,7 @@ static void do_cpu_timer_interrupt(unsigned int ext_int_code,
         struct list_head cb_list;       /* the callback queue */
         __u64 elapsed, next;
 
+        kstat_cpu(smp_processor_id()).irqs[EXTINT_TMR]++;
         INIT_LIST_HEAD(&cb_list);
         vq = &__get_cpu_var(virt_cpu_timer);
 
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index fe5701e9efbf..839b16df72b3 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -10,6 +10,7 @@
  *    Copyright (C) 1995  Linus Torvalds
  */
 
+#include <linux/kernel_stat.h>
 #include <linux/perf_event.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
@@ -543,6 +544,7 @@ static void pfault_interrupt(unsigned int ext_int_code,
         struct task_struct *tsk;
         __u16 subcode;
 
+        kstat_cpu(smp_processor_id()).irqs[EXTINT_PFL]++;
         /*
          * Get the external interruption subcode & pfault
          * initial/completion signal bit. VM stores this