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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 536 bytes --]

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.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the final tree (tip tree 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));

Re: linux-next: build failure after merge of the final tree (tip tree 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?

[tip:perf/core] perf, sh: Fix patch merge foul-up

[tip-bot for Matt Fleming]

Commit-ID:  64a48d90149bb7007275fac13eaa4cb8d8ce12ea
Gitweb:     http://git.kernel.org/tip/64a48d90149bb7007275fac13eaa4cb8d8ce12ea
Author:     Matt Fleming <matt@console-pimps.org>
AuthorDate: Mon, 13 Sep 2010 20:17:29 +0100
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 15 Sep 2010 10:43:59 +0200

perf, sh: Fix patch merge foul-up

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

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20100913191729.GA6440@console-pimps.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/sh/kernel/perf_event.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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));