Commit 0fc537d1 authored by Helge Deller's avatar Helge Deller

parisc: tlb flush counting fix for SMP and UP

Fix up build error on UP and show correctly number of function call
(ipi) irqs.
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent cd85d551
...@@ -19,12 +19,8 @@ typedef struct { ...@@ -19,12 +19,8 @@ typedef struct {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
unsigned int irq_resched_count; unsigned int irq_resched_count;
unsigned int irq_call_count; unsigned int irq_call_count;
/*
* irq_tlb_count is double-counted in irq_call_count, so it must be
* subtracted from irq_call_count when displaying irq_call_count
*/
unsigned int irq_tlb_count;
#endif #endif
unsigned int irq_tlb_count;
} ____cacheline_aligned irq_cpustat_t; } ____cacheline_aligned irq_cpustat_t;
DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat); DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);
......
...@@ -22,6 +22,8 @@ extern spinlock_t pa_tlb_lock; ...@@ -22,6 +22,8 @@ extern spinlock_t pa_tlb_lock;
extern void flush_tlb_all(void); extern void flush_tlb_all(void);
extern void flush_tlb_all_local(void *); extern void flush_tlb_all_local(void *);
#define smp_flush_tlb_all() flush_tlb_all()
/* /*
* flush_tlb_mm() * flush_tlb_mm()
* *
......
...@@ -175,14 +175,13 @@ int arch_show_interrupts(struct seq_file *p, int prec) ...@@ -175,14 +175,13 @@ int arch_show_interrupts(struct seq_file *p, int prec)
seq_printf(p, " Rescheduling interrupts\n"); seq_printf(p, " Rescheduling interrupts\n");
seq_printf(p, "%*s: ", prec, "CAL"); seq_printf(p, "%*s: ", prec, "CAL");
for_each_online_cpu(j) for_each_online_cpu(j)
seq_printf(p, "%10u ", irq_stats(j)->irq_call_count - seq_printf(p, "%10u ", irq_stats(j)->irq_call_count);
irq_stats(j)->irq_tlb_count);
seq_printf(p, " Function call interrupts\n"); seq_printf(p, " Function call interrupts\n");
#endif
seq_printf(p, "%*s: ", prec, "TLB"); seq_printf(p, "%*s: ", prec, "TLB");
for_each_online_cpu(j) for_each_online_cpu(j)
seq_printf(p, "%10u ", irq_stats(j)->irq_tlb_count); seq_printf(p, "%10u ", irq_stats(j)->irq_tlb_count);
seq_printf(p, " TLB shootdowns\n"); seq_printf(p, " TLB shootdowns\n");
#endif
return 0; return 0;
} }
......
...@@ -263,17 +263,6 @@ void arch_send_call_function_single_ipi(int cpu) ...@@ -263,17 +263,6 @@ void arch_send_call_function_single_ipi(int cpu)
send_IPI_single(cpu, IPI_CALL_FUNC_SINGLE); send_IPI_single(cpu, IPI_CALL_FUNC_SINGLE);
} }
/*
* Flush all other CPU's tlb and then mine. Do this with on_each_cpu()
* as we want to ensure all TLB's flushed before proceeding.
*/
void
smp_flush_tlb_all(void)
{
on_each_cpu(flush_tlb_all_local, NULL, 1);
}
/* /*
* Called by secondaries to update state and initialize CPU registers. * Called by secondaries to update state and initialize CPU registers.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment