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, 146 deletions

diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index 8d525765a6c4..6d9bf3936c78 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -253,152 +253,6 @@ unsigned int do_IRQ(struct pt_regs *regs)
         return 1;
 }
 
-/*
- * Interrupt statistics:
- */
-
-atomic_t irq_err_count;
-
-/*
- * /proc/interrupts printing:
- */
-
-static int show_other_interrupts(struct seq_file *p)
-{
-        int j;
-
-        seq_printf(p, "NMI: ");
-        for_each_online_cpu(j)
-                seq_printf(p, "%10u ", nmi_count(j));
-        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_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
-#ifdef CONFIG_X86_MCE
-        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");
-#endif
-#ifdef CONFIG_X86_LOCAL_APIC
-        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");
-#endif
-        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));
-#endif
-        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 = nmi_count(cpu);
-
-#ifdef CONFIG_X86_LOCAL_APIC
-        sum += per_cpu(irq_stat, cpu).apic_timer_irqs;
-#endif
-#ifdef CONFIG_SMP
-        sum += per_cpu(irq_stat, cpu).irq_resched_count;
-        sum += per_cpu(irq_stat, cpu).irq_call_count;
-        sum += per_cpu(irq_stat, cpu).irq_tlb_count;
-#endif
-#ifdef CONFIG_X86_MCE
-        sum += per_cpu(irq_stat, cpu).irq_thermal_count;
-#endif
-#ifdef CONFIG_X86_LOCAL_APIC
-        sum += per_cpu(irq_stat, cpu).irq_spurious_count;
-#endif
-        return sum;
-}
-
-u64 arch_irq_stat(void)
-{
-        u64 sum = atomic_read(&irq_err_count);
-
-#ifdef CONFIG_X86_IO_APIC
-        sum += atomic_read(&irq_mis_count);
-#endif
-        return sum;
-}
-
 #ifdef CONFIG_HOTPLUG_CPU
 #include <mach_apic.h>