Messages in this thread Patch in this message | | | Subject | Re: linux-next: build failure after merge of the final tree (tip tree related) | From | Peter Zijlstra <> | Date | Mon, 29 Nov 2010 23:30:19 +0100 |
| |
On Mon, 2010-11-29 at 13:50 +1100, Stephen Rothwell wrote: > Hi all, > > After merging the final tree, today's linux-next build (sparc64 defconfig) > failed like this: > > arch/sparc/kernel/perf_event.c:1326: error: 'init_hw_perf_event' undeclared here (not in a function) > > Caused by commit 004417a6d468e24399e383645c068b498eed84ad ("perf, arch: > Cleanup perf-pmu init vs lockup-detector"). > > I reverted that commit for today.
Ingo, can we back-merge this?
--- arch/sparc/kernel/perf_event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c index 75c5b12..39348b1 100644 --- a/arch/sparc/kernel/perf_event.c +++ b/arch/sparc/kernel/perf_event.c @@ -1323,7 +1323,7 @@ int __init init_hw_perf_events(void) return 0; } -early_initcall(init_hw_perf_event); +early_initcall(init_hw_perf_events); void perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)
| |