parisc: do not count IPI calls twice

The number of IPI calls is already visible as per-cpu IPI irq counters
in/proc/cpuinfo, so let's drop this additional counting.

This partly reverts:
cd85d55 parisc: more irq statistics in /proc/interrupts

Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/arch/parisc/include/asm/hardirq.h b/arch/parisc/include/asm/hardirq.h
index 241c34518465d9404f56b786a86554a1e89824a3..9b3bd039a609d57663cbe3374d5863a95415cac3 100644 (file)
--- a/arch/parisc/include/asm/hardirq.h
+++ b/arch/parisc/include/asm/hardirq.h
@@ -21,7 +21,6 @@ typedef struct {
        unsigned int irq_stack_usage;
 #ifdef CONFIG_SMP
        unsigned int irq_resched_count;
-       unsigned int irq_call_count;
 #endif
        unsigned int irq_unaligned_count;
        unsigned int irq_fpassist_count;

diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index 2e6443b1e9228426ba94d8602c8956c5daec93c2..501ac8b4dcdf4aff7e776d0c683296fdf4dd7462 100644 (file)
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -179,10 +179,6 @@ int arch_show_interrupts(struct seq_file *p, int prec)
        for_each_online_cpu(j)
                seq_printf(p, "%10u ", irq_stats(j)->irq_resched_count);
        seq_puts(p, "  Rescheduling interrupts\n");
-       seq_printf(p, "%*s: ", prec, "CAL");
-       for_each_online_cpu(j)
-               seq_printf(p, "%10u ", irq_stats(j)->irq_call_count);
-       seq_puts(p, "  Function call interrupts\n");
 #endif
        seq_printf(p, "%*s: ", prec, "UAH");
        for_each_online_cpu(j)

diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index 2b96602e812ff9648f0ce9ec66b52e103ddb8a3e..ceda229ea6c2ef60cee170db5d6efe58f0df801b 100644 (file)
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -125,11 +125,6 @@ ipi_interrupt(int irq, void *dev_id)
        unsigned long ops;
        unsigned long flags;
 
-       /* Count this now; we may make a call that never returns. */
-       inc_irq_stat(irq_call_count);
-
-       mb();   /* Order interrupt and bit testing. */
-
        for (;;) {
                spinlock_t *lock = &per_cpu(ipi_lock, this_cpu);
                spin_lock_irqsave(lock, flags);