Re: linux-next: build failure after merge of the final tree (tiptree related)

[Matt Fleming]

On Tue, Sep 14, 2010 at 12:06:13AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the final tree, today's linux-next build (many sh configs)
> failed like this:
> 
> arch/sh/kernel/perf_event.c: In function 'sh_pmu_setup':
> arch/sh/kernel/perf_event.c:342: error: parameter 'cpuhw' is initialized
> 
> And it went down hill from there.
> 
> Caused by commit b0a873ebbf87bf38bf70b5e39a7cadc96099fa13 ("perf:
> Register PMU implementations") which removed the opening brace of that
> function.

3f6da390 ("perf: Rework and fix the arch CPU-hotplug hooks") introduced
this breakage. sh_pmu_setup() is missing an opening curly brace, e.g.

diff --git a/arch/sh/kernel/perf_event.c b/arch/sh/kernel/perf_event.c
index cf39c48..036f7a9 100644
--- a/arch/sh/kernel/perf_event.c
+++ b/arch/sh/kernel/perf_event.c
@@ -338,7 +338,7 @@ static struct pmu pmu = {
 };
 
 static void sh_pmu_setup(int cpu)
-
+{
 	struct cpu_hw_events *cpuhw = &per_cpu(cpu_hw_events, cpu);
 
 	memset(cpuhw, 0, sizeof(struct cpu_hw_events));
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/