aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-06-11 20:14:22 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-11 23:03:13 -0400
commite14112d1bd5e193166b54be19119cf6440470560 (patch)
tree7e38942535b91872b5f9869a1e6597add34c60cc /arch
parenta525890cb6a2949b644d212ae290b658967d3919 (diff)
perfcounters: remove powerpc definitions of perf_counter_do_pending
Commit 925d519ab82b6dd7aca9420d809ee83819c08db2 ("perf_counter: unify and fix delayed counter wakeup") added global definitions. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Paul Mackerras <paulus@samba.org> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/include/asm/hw_irq.h3
-rw-r--r--arch/powerpc/kernel/irq.c1
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index 20a44d0c9fd..53512374e1c 100644
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -156,8 +156,6 @@ static inline void clear_perf_counter_pending(void)
156 "i" (offsetof(struct paca_struct, perf_counter_pending))); 156 "i" (offsetof(struct paca_struct, perf_counter_pending)));
157} 157}
158 158
159extern void perf_counter_do_pending(void);
160
161#else 159#else
162 160
163static inline unsigned long test_perf_counter_pending(void) 161static inline unsigned long test_perf_counter_pending(void)
@@ -167,7 +165,6 @@ static inline unsigned long test_perf_counter_pending(void)
167 165
168static inline void set_perf_counter_pending(void) {} 166static inline void set_perf_counter_pending(void) {}
169static inline void clear_perf_counter_pending(void) {} 167static inline void clear_perf_counter_pending(void) {}
170static inline void perf_counter_do_pending(void) {}
171#endif /* CONFIG_PERF_COUNTERS */ 168#endif /* CONFIG_PERF_COUNTERS */
172 169
173#endif /* __KERNEL__ */ 170#endif /* __KERNEL__ */
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index feff792ed0f..844d3f882a1 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -53,6 +53,7 @@
53#include <linux/bootmem.h> 53#include <linux/bootmem.h>
54#include <linux/pci.h> 54#include <linux/pci.h>
55#include <linux/debugfs.h> 55#include <linux/debugfs.h>
56#include <linux/perf_counter.h>
56 57
57#include <asm/uaccess.h> 58#include <asm/uaccess.h>
58#include <asm/system.h> 59#include <asm/system.h>