Re: [PATCH] perf/powerpc: Fix build-test failure

[Arnaldo Carvalho de Melo]

Em Wed, Sep 07, 2016 at 09:07:54PM +0530, Ravi Bangoria escreveu:
> Hi Arnaldo,
> 
> Can you please pick up this.
> 
> -Ravi
> 
> On Wednesday 31 August 2016 01:33 PM, Ravi Bangoria wrote:
> > 'make -C tools/perf build-test' is failing with below log for poewrpc.
> >
> >   In file included from /tmp/tmp.3eEwmGlYaF/perf-4.8.0-rc4/tools/perf/perf.h:15:0,
> >                    from util/cpumap.h:8,
> >                    from util/env.c:1:
> >   /tmp/tmp.3eEwmGlYaF/perf-4.8.0-rc4/tools/perf/perf-sys.h:23:56:
> >   fatal error: ../../arch/powerpc/include/uapi/asm/unistd.h: No such file or directory
> >   compilation terminated.
> >
> > I bisected it and found it's failing from commit ad430729ae00 ("Remove:
> > kernel unistd*h files from perf's MANIFEST, not used").

The above commit ad430729ae00 is broken for ppc, as we were still
referencing that kernel file, thanks for spotting this, adding your
patch with a Fixes ad430729ae00.

- Arnaldo

> > Header file '../../arch/powerpc/include/uapi/asm/unistd.h' is included
> > only for powerpc in tools/perf/perf-sys.h.
> >
> > By looking closly at commit history, I found little weird thing:
> >
> > Commit f2d9cae9ea9e ("perf powerpc: Use uapi/unistd.h to fix build
> > error") replaced 'asm/unistd.h' with 'uapi/asm/unistd.h'
> >
> > Commit d2709c7ce4c5 ("perf: Make perf build for x86 with UAPI
> > disintegration applied") removes all arch specific 'uapi/asm/unistd.h'
> > for all archs and adds generic <asm/unistd.h>.
> >
> > Commit f0b9abfb0446 ("Merge branch 'linus' into perf/core") again
> > includes 'uapi/asm/unistd.h' for powerpc. Don't know how exactly this
> > happened as this change is not part of commit also.
> >
> > Signed-off-by: Ravi Bangoria <ravi.bangoria@xxxxxxxxxxxxxxxxxx>
> > ---
> >  tools/perf/perf-sys.h | 1 -
> >  1 file changed, 1 deletion(-)
> >
> > diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h
> > index 7ed72a4..e4b717e 100644
> > --- a/tools/perf/perf-sys.h
> > +++ b/tools/perf/perf-sys.h
> > @@ -20,7 +20,6 @@
> >  #endif
> >
> >  #ifdef __powerpc__
> > -#include "../../arch/powerpc/include/uapi/asm/unistd.h"
> >  #define CPUINFO_PROC	{"cpu"}
> >  #endif
> >