1 files changed, 43 insertions, 6 deletions

diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index e173b763f148..d3fde94f7345 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -255,9 +255,17 @@ int show_interrupts(struct seq_file *p, void *v)
         }
 
         if (i < NR_IRQS) {
+                unsigned any_count = 0;
+
                 spin_lock_irqsave(&irq_desc[i].lock, flags);
+#ifndef CONFIG_SMP
+                any_count = kstat_irqs(i);
+#else
+                for_each_online_cpu(j)
+                        any_count |= kstat_cpu(j).irqs[i];
+#endif
                 action = irq_desc[i].action;
-                if (!action)
+                if (!action && !any_count)
                         goto skip;
                 seq_printf(p, "%3d: ",i);
 #ifndef CONFIG_SMP
@@ -268,10 +276,12 @@ int show_interrupts(struct seq_file *p, void *v)
 #endif
                 seq_printf(p, " %8s", irq_desc[i].chip->name);
                 seq_printf(p, "-%-8s", irq_desc[i].name);
-                seq_printf(p, "  %s", action->name);
 
-                for (action=action->next; action; action = action->next)
-                        seq_printf(p, ", %s", action->name);
+                if (action) {
+                        seq_printf(p, "  %s", action->name);
+                        while ((action = action->next) != NULL)
+                                seq_printf(p, ", %s", action->name);
+                }
 
                 seq_putc(p, '\n');
 skip:
@@ -280,14 +290,41 @@ skip:
                 seq_printf(p, "NMI: ");
                 for_each_online_cpu(j)
                         seq_printf(p, "%10u ", nmi_count(j));
-                seq_putc(p, '\n');
+                seq_printf(p, "  Non-maskable interrupts\n");
 #ifdef CONFIG_X86_LOCAL_APIC
                 seq_printf(p, "LOC: ");
                 for_each_online_cpu(j)
                         seq_printf(p, "%10u ",
                                 per_cpu(irq_stat,j).apic_timer_irqs);
-                seq_putc(p, '\n');
+                seq_printf(p, "  Local timer interrupts\n");
 #endif
+#ifdef CONFIG_SMP
+                seq_printf(p, "RES: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ",
+                                per_cpu(irq_stat,j).irq_resched_count);
+                seq_printf(p, "  Rescheduling interrupts\n");
+                seq_printf(p, "CAL: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ",
+                                per_cpu(irq_stat,j).irq_call_count);
+                seq_printf(p, "  function call interrupts\n");
+                seq_printf(p, "TLB: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ",
+                                per_cpu(irq_stat,j).irq_tlb_count);
+                seq_printf(p, "  TLB shootdowns\n");
+#endif
+                seq_printf(p, "TRM: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ",
+                                per_cpu(irq_stat,j).irq_thermal_count);
+                seq_printf(p, "  Thermal event interrupts\n");
+                seq_printf(p, "SPU: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ",
+                                per_cpu(irq_stat,j).irq_spurious_count);
+                seq_printf(p, "  Spurious interrupts\n");
                 seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
 #if defined(CONFIG_X86_IO_APIC)
                 seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count));