OSDN Git Service

perfcounters: remove powerpc definitions of perf_counter_do_pending
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 12 Jun 2009 00:14:22 +0000 (10:14 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Jun 2009 03:03:13 +0000 (20:03 -0700)
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>
arch/powerpc/include/asm/hw_irq.h
arch/powerpc/kernel/irq.c

index 20a44d0..5351237 100644 (file)
@@ -156,8 +156,6 @@ static inline void clear_perf_counter_pending(void)
                "i" (offsetof(struct paca_struct, perf_counter_pending)));
 }
 
-extern void perf_counter_do_pending(void);
-
 #else
 
 static inline unsigned long test_perf_counter_pending(void)
@@ -167,7 +165,6 @@ static inline unsigned long test_perf_counter_pending(void)
 
 static inline void set_perf_counter_pending(void) {}
 static inline void clear_perf_counter_pending(void) {}
-static inline void perf_counter_do_pending(void) {}
 #endif /* CONFIG_PERF_COUNTERS */
 
 #endif /* __KERNEL__ */
index feff792..844d3f8 100644 (file)
@@ -53,6 +53,7 @@
 #include <linux/bootmem.h>
 #include <linux/pci.h>
 #include <linux/debugfs.h>
+#include <linux/perf_counter.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>