Re: arm/arm64 perf build issue with mainline

From: Arnaldo Carvalho de Melo
Date: Mon Apr 27 2015 - 15:00:17 EST


Em Mon, Apr 27, 2015 at 08:52:08PM +0200, Jiri Olsa escreveu:
> On Mon, Apr 27, 2015 at 03:45:35PM -0300, Arnaldo Carvalho de Melo wrote:
>
> SNIP
>
> > > > [acme@ssdandy linux]$
> > > >
> > >
> > > how about this one
> >
> > I came up with this one, that doesn't introduces a new file:
>
> ook
>
> >
> > From e8155c06652a05f2307d53823a7937be5dad4e32 Mon Sep 17 00:00:00 2001
> > From: Will Deacon <will.deacon@xxxxxxx>
> > Date: Thu, 23 Apr 2015 15:00:16 +0100
> > Subject: [PATCH] tools perf: Use getconf to determine number of online CPUs
> >
> > Parsing /proc/cpuinfo is a fiddly, arch-dependent business anda recent
> > change to get it working for Sparc broke arm and arm64 platforms.
> >
> > Use sysconf to determine the number of online CPUs only parsing
> > /proc/cpuinfo when sysconf is not available.
> >
> > Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
> > Cc: David Ahern <david.ahern@xxxxxxxxxx>
> > Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
> > Cc: Mark Rutland <Mark.Rutland@xxxxxxx>
> > Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
> > Link: http://lkml.kernel.org/r/20150423140454.GJ1652@xxxxxxx
> > [ Made it fall back to parsing /proc when getconf not found ]
> > Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> > ---
> > tools/perf/Makefile | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/perf/Makefile b/tools/perf/Makefile
> > index c699dc35eef9..bc846b83c295 100644
> > --- a/tools/perf/Makefile
> > +++ b/tools/perf/Makefile
> > @@ -24,7 +24,7 @@ unexport MAKEFLAGS
> > # (To override it, run 'make JOBS=1' and similar.)
> > #
> > ifeq ($(JOBS),)
> > - JOBS := $(shell egrep -c '^processor|^CPU' /proc/cpuinfo 2>/dev/null)
> > + JOBS := $(shell (getconf _NPROCESSORS_ONLN || egrep -c '^processor|^CPU' /proc/cpuinfo) 2>/dev/null)
>
> how about the 'CPU[0-9]' someone asked for?

Ok, will fold that in, are you ok with going with this patch plus this
[0-9] change? I.e. acked?


- Arnaldo
--
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/