Skip to content

Commit e14112d

Browse files
sfrothwelltorvalds
authored andcommitted
perfcounters: remove powerpc definitions of perf_counter_do_pending
Commit 925d519 ("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>
1 parent a525890 commit e14112d

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

arch/powerpc/include/asm/hw_irq.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@ static inline void clear_perf_counter_pending(void)
156156
"i" (offsetof(struct paca_struct, perf_counter_pending)));
157157
}
158158

159-
extern void perf_counter_do_pending(void);
160-
161159
#else
162160

163161
static inline unsigned long test_perf_counter_pending(void)
@@ -167,7 +165,6 @@ static inline unsigned long test_perf_counter_pending(void)
167165

168166
static inline void set_perf_counter_pending(void) {}
169167
static inline void clear_perf_counter_pending(void) {}
170-
static inline void perf_counter_do_pending(void) {}
171168
#endif /* CONFIG_PERF_COUNTERS */
172169

173170
#endif /* __KERNEL__ */

arch/powerpc/kernel/irq.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
#include <linux/bootmem.h>
5454
#include <linux/pci.h>
5555
#include <linux/debugfs.h>
56+
#include <linux/perf_counter.h>
5657

5758
#include <asm/uaccess.h>
5859
#include <asm/system.h>

0 commit comments

Comments
 (0)