Messages in this thread Patch in this message | | | Subject | Re: linux-next: origin tree build failure | From | Benjamin Herrenschmidt <> | Date | Fri, 12 Jun 2009 11:00:06 +1000 |
| |
On Fri, 2009-06-12 at 10:24 +1000, Stephen Rothwell wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Fri, 12 Jun 2009 10:14:22 +1000 > Subject: [PATCH] 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: Benjamin Herrenschmidt <benh@kernel.crashing.org> ---
Linus, please apply. BTW, This is _EXACTLY_ why this should have been in -next for a few days before being merged :-(
Cheers, Ben.
> --- > arch/powerpc/include/asm/hw_irq.h | 3 --- > arch/powerpc/kernel/irq.c | 1 + > 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 20a44d0..5351237 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) > "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__ */ > diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c > index feff792..844d3f8 100644 > --- a/arch/powerpc/kernel/irq.c > +++ b/arch/powerpc/kernel/irq.c > @@ -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>
| |