diff options
author | Helge Deller <deller@gmx.de> | 2013-10-26 18:26:20 -0400 |
---|---|---|
committer | Helge Deller <deller@gmx.de> | 2013-11-07 16:28:54 -0500 |
commit | 6f0c4aa61d30131ceb32f2a9926dd71cc5cd003a (patch) | |
tree | 564ee01886e301b0cab90e21a72bcacacf8460bd /arch/parisc/kernel | |
parent | f6d12eefcda2e4135aa529ab8b5bf2766b4a78dd (diff) |
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>
Diffstat (limited to 'arch/parisc/kernel')
-rw-r--r-- | arch/parisc/kernel/irq.c | 4 | ||||
-rw-r--r-- | arch/parisc/kernel/smp.c | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index 2e6443b1e922..501ac8b4dcdf 100644 --- 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) | |||
179 | for_each_online_cpu(j) | 179 | for_each_online_cpu(j) |
180 | seq_printf(p, "%10u ", irq_stats(j)->irq_resched_count); | 180 | seq_printf(p, "%10u ", irq_stats(j)->irq_resched_count); |
181 | seq_puts(p, " Rescheduling interrupts\n"); | 181 | seq_puts(p, " Rescheduling interrupts\n"); |
182 | seq_printf(p, "%*s: ", prec, "CAL"); | ||
183 | for_each_online_cpu(j) | ||
184 | seq_printf(p, "%10u ", irq_stats(j)->irq_call_count); | ||
185 | seq_puts(p, " Function call interrupts\n"); | ||
186 | #endif | 182 | #endif |
187 | seq_printf(p, "%*s: ", prec, "UAH"); | 183 | seq_printf(p, "%*s: ", prec, "UAH"); |
188 | for_each_online_cpu(j) | 184 | for_each_online_cpu(j) |
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index 2b96602e812f..ceda229ea6c2 100644 --- a/arch/parisc/kernel/smp.c +++ b/arch/parisc/kernel/smp.c | |||
@@ -125,11 +125,6 @@ ipi_interrupt(int irq, void *dev_id) | |||
125 | unsigned long ops; | 125 | unsigned long ops; |
126 | unsigned long flags; | 126 | unsigned long flags; |
127 | 127 | ||
128 | /* Count this now; we may make a call that never returns. */ | ||
129 | inc_irq_stat(irq_call_count); | ||
130 | |||
131 | mb(); /* Order interrupt and bit testing. */ | ||
132 | |||
133 | for (;;) { | 128 | for (;;) { |
134 | spinlock_t *lock = &per_cpu(ipi_lock, this_cpu); | 129 | spinlock_t *lock = &per_cpu(ipi_lock, this_cpu); |
135 | spin_lock_irqsave(lock, flags); | 130 | spin_lock_irqsave(lock, flags); |