x86: unify show_interrupts() and proc helpers

show_interrupts() and proc helpers are basically the same for
32 and 64 bit. Move them to a shared source file.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 0 insertions, 132 deletions

diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
index 4f374294f292..39ef7feb9ea4 100644
--- a/arch/x86/kernel/irq_64.c
+++ b/arch/x86/kernel/irq_64.c
@@ -18,8 +18,6 @@
 #include <asm/idle.h>
 #include <asm/smp.h>
 
-atomic_t irq_err_count;
-
 /*
  * 'what should we do if we get a hw irq event on an illegal vector'.
  * each architecture has to answer this themselves.
@@ -65,136 +63,6 @@ static inline void stack_overflow_check(struct pt_regs *regs)
 #endif
 
 /*
- * Generic, controller-independent functions:
- */
-
-static int show_other_interrupts(struct seq_file *p)
-{
-        int j;
-
-        seq_printf(p, "NMI: ");
-        for_each_online_cpu(j)
-                seq_printf(p, "%10u ", cpu_pda(j)->__nmi_count);
-        seq_printf(p, "  Non-maskable interrupts\n");
-        seq_printf(p, "LOC: ");
-        for_each_online_cpu(j)
-                seq_printf(p, "%10u ", cpu_pda(j)->apic_timer_irqs);
-        seq_printf(p, "  Local timer interrupts\n");
-#ifdef CONFIG_SMP
-        seq_printf(p, "RES: ");
-        for_each_online_cpu(j)
-                seq_printf(p, "%10u ", cpu_pda(j)->irq_resched_count);
-        seq_printf(p, "  Rescheduling interrupts\n");
-        seq_printf(p, "CAL: ");
-        for_each_online_cpu(j)
-                seq_printf(p, "%10u ", cpu_pda(j)->irq_call_count);
-        seq_printf(p, "  Function call interrupts\n");
-        seq_printf(p, "TLB: ");
-        for_each_online_cpu(j)
-                seq_printf(p, "%10u ", cpu_pda(j)->irq_tlb_count);
-        seq_printf(p, "  TLB shootdowns\n");
-#endif
-#ifdef CONFIG_X86_MCE
-        seq_printf(p, "TRM: ");
-        for_each_online_cpu(j)
-                seq_printf(p, "%10u ", cpu_pda(j)->irq_thermal_count);
-        seq_printf(p, "  Thermal event interrupts\n");
-        seq_printf(p, "THR: ");
-        for_each_online_cpu(j)
-                seq_printf(p, "%10u ", cpu_pda(j)->irq_threshold_count);
-        seq_printf(p, "  Threshold APIC interrupts\n");
-#endif
-        seq_printf(p, "SPU: ");
-        for_each_online_cpu(j)
-                seq_printf(p, "%10u ", cpu_pda(j)->irq_spurious_count);
-        seq_printf(p, "  Spurious interrupts\n");
-        seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
-
-        return 0;
-}
-
-int show_interrupts(struct seq_file *p, void *v)
-{
-        unsigned long flags, any_count = 0;
-        int i = *(loff_t *) v, j;
-        struct irqaction *action;
-        struct irq_desc *desc;
-
-        if (i > nr_irqs)
-                return 0;
-
-        if (i == nr_irqs)
-                return show_other_interrupts(p);
-
-        /* print header */
-        if (i == 0) {
-                seq_printf(p, "           ");
-                for_each_online_cpu(j)
-                        seq_printf(p, "CPU%-8d",j);
-                seq_putc(p, '\n');
-        }
-
-        desc = irq_to_desc(i);
-        spin_lock_irqsave(&desc->lock, flags);
-#ifndef CONFIG_SMP
-        any_count = kstat_irqs(i);
-#else
-        for_each_online_cpu(j)
-                any_count |= kstat_irqs_cpu(i, j);
-#endif
-        action = desc->action;
-        if (!action && !any_count)
-                goto out;
-
-        seq_printf(p, "%3d: ", i);
-#ifndef CONFIG_SMP
-        seq_printf(p, "%10u ", kstat_irqs(i));
-#else
-        for_each_online_cpu(j)
-                seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
-#endif
-        seq_printf(p, " %8s", desc->chip->name);
-        seq_printf(p, "-%-8s", desc->name);
-
-        if (action) {
-                seq_printf(p, "  %s", action->name);
-                while ((action = action->next) != NULL)
-                        seq_printf(p, ", %s", action->name);
-        }
-
-        seq_putc(p, '\n');
-out:
-        spin_unlock_irqrestore(&desc->lock, flags);
-        return 0;
-}
-
-/*
- * /proc/stat helpers
- */
-u64 arch_irq_stat_cpu(unsigned int cpu)
-{
-        u64 sum = cpu_pda(cpu)->__nmi_count;
-
-        sum += cpu_pda(cpu)->apic_timer_irqs;
-#ifdef CONFIG_SMP
-        sum += cpu_pda(cpu)->irq_resched_count;
-        sum += cpu_pda(cpu)->irq_call_count;
-        sum += cpu_pda(cpu)->irq_tlb_count;
-#endif
-#ifdef CONFIG_X86_MCE
-        sum += cpu_pda(cpu)->irq_thermal_count;
-        sum += cpu_pda(cpu)->irq_threshold_count;
-#endif
-        sum += cpu_pda(cpu)->irq_spurious_count;
-        return sum;
-}
-
-u64 arch_irq_stat(void)
-{
-        return atomic_read(&irq_err_count);
-}
-
-/*
  * do_IRQ handles all normal device IRQ's (the special
  * SMP cross-CPU interrupts have their own specific
  * handlers).