aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/include
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2013-05-07 17:42:47 -0400
committerHelge Deller <deller@gmx.de>2013-05-07 17:44:04 -0400
commit0fc537d1d655cdae69b489dbba46ad617cfc1373 (patch)
treebc4d826346201de329257d010b74d258a1c35012 /arch/parisc/include
parentcd85d5514d5c4d7e78abac923fc032457d0c5091 (diff)
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: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch/parisc/include')
-rw-r--r--arch/parisc/include/asm/hardirq.h6
-rw-r--r--arch/parisc/include/asm/tlbflush.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/parisc/include/asm/hardirq.h b/arch/parisc/include/asm/hardirq.h
index a9c0fb195253..12373c4dabab 100644
--- a/arch/parisc/include/asm/hardirq.h
+++ b/arch/parisc/include/asm/hardirq.h
@@ -19,12 +19,8 @@ typedef struct {
19#ifdef CONFIG_SMP 19#ifdef CONFIG_SMP
20 unsigned int irq_resched_count; 20 unsigned int irq_resched_count;
21 unsigned int irq_call_count; 21 unsigned int irq_call_count;
22 /*
23 * irq_tlb_count is double-counted in irq_call_count, so it must be
24 * subtracted from irq_call_count when displaying irq_call_count
25 */
26 unsigned int irq_tlb_count;
27#endif 22#endif
23 unsigned int irq_tlb_count;
28} ____cacheline_aligned irq_cpustat_t; 24} ____cacheline_aligned irq_cpustat_t;
29 25
30DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat); 26DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);
diff --git a/arch/parisc/include/asm/tlbflush.h b/arch/parisc/include/asm/tlbflush.h
index 8f1a8100bf2d..5273da991e06 100644
--- a/arch/parisc/include/asm/tlbflush.h
+++ b/arch/parisc/include/asm/tlbflush.h
@@ -22,6 +22,8 @@ extern spinlock_t pa_tlb_lock;
22extern void flush_tlb_all(void); 22extern void flush_tlb_all(void);
23extern void flush_tlb_all_local(void *); 23extern void flush_tlb_all_local(void *);
24 24
25#define smp_flush_tlb_all() flush_tlb_all()
26
25/* 27/*
26 * flush_tlb_mm() 28 * flush_tlb_mm()
27 * 29 *