[PATCH 1/1] perf tools: Fix build break on powerpc

[Arnaldo Carvalho de Melo]

Em Sun, Mar 27, 2016 at 01:19:03PM +0200, Jiri Olsa escreveu:
> On Sat, Mar 26, 2016 at 11:01:47AM -0700, Sukadev Bhattiprolu wrote:
> > From 502e8236082412db1d33abfad95aaf14b539502e Mon Sep 17 00:00:00 2001
> > From: Sukadev Bhattiprolu <sukadev at linux.vnet.ibm.com>
> > Date: Sat, 26 Mar 2016 17:31:39 -0400
> > Subject: [PATCH 1/1] perf tools: Fix build break on powerpc
> > MIME-Version: 1.0
> > Content-Type: text/plain; charset=UTF-8
> > Content-Transfer-Encoding: 8bit
> > 
> > 'Commit 531d2410635c ("perf tools: Do not include stringify.h from the
> > kernel sources")' seems to have accidentially removed the inclusion of
> > "util/header.h" from "arch/powerpc/util/header.c".
> > 
> > "util/header.h" provides the prototype for get_cpuid() and is needed to
> > build perf on Powerpc.
> > 
> > 	arch/powerpc/util/header.c:17:1: error: no previous prototype for
> > 	‘get_cpuid’ [-Werror=missing-prototypes]
> > 
> > Reported-by: Michael Ellerman <mpe at ellerman.id.au>
> > Signed-off-by: Sukadev Bhattiprolu <sukadev at linux.vnet.ibm.com>
> > ---
> >  tools/perf/arch/powerpc/util/header.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/tools/perf/arch/powerpc/util/header.c b/tools/perf/arch/powerpc/util/header.c
> > index 6138bde..5111e34 100644
> > --- a/tools/perf/arch/powerpc/util/header.c
> > +++ b/tools/perf/arch/powerpc/util/header.c
> > @@ -4,6 +4,7 @@
> >  #include <stdlib.h>
> >  #include <string.h>
> >  #include <linux/stringify.h>
> > +#include "../../util/header.h"
> 
> you could use just "header.h" right?

Like this? I'm trying to find a way to do ppc cross builds, one more
thing to have in the build-tests...

commit 150da025b7f135450ca833fb80d54d59f0ddf185
Author: Sukadev Bhattiprolu <sukadev at linux.vnet.ibm.com>
Date:   Mon Mar 28 09:31:41 2016 -0300

    perf tools: Fix build break on powerpc
    
    Commit 531d2410635c ("perf tools: Do not include stringify.h from the
    kernel sources") seems to have accidentially removed the inclusion of
    "util/header.h" from "arch/powerpc/util/header.c".
    
    "util/header.h" provides the prototype for get_cpuid() and is needed to
    build perf on Powerpc:
    
            arch/powerpc/util/header.c:17:1: error: no previous prototype for ‘get_cpuid’ [-Werror=missing-prototypes]
    
    Reported-by: Michael Ellerman <mpe at ellerman.id.au>
    Fixes: 531d2410635c ("perf tools: Do not include stringify.h from the kernel sources")
    Signed-off-by: Sukadev Bhattiprolu <sukadev at linux.vnet.ibm.com>
    Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>

diff --git a/tools/perf/arch/powerpc/util/header.c b/tools/perf/arch/powerpc/util/header.c
index 6138bdef6e63..6de1a93241ae 100644
--- a/tools/perf/arch/powerpc/util/header.c
+++ b/tools/perf/arch/powerpc/util/header.c
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <linux/stringify.h>
+#include "header.h"
 
 #define mfspr(rn)       ({unsigned long rval; \
 			 asm volatile("mfspr %0," __stringify(rn) \