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

[Peter Zijlstra]

On Mon, 2010-09-13 at 20:17 +0100, Matt Fleming wrote:
> 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)); 


Gah, that's actually breakage from b0a873ebbf8 (perf: Register PMU
implementations), which has the below fudge:


+static struct pmu pmu = {
+       .event_init     = sh_pmu_event_init,
+       .enable         = sh_pmu_enable,
+       .disable        = sh_pmu_disable,
+       .read           = sh_pmu_read,
+};
+
 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));


Ingo, could you back-merge this?
--
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/