summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2015-04-23 15:00:16 +0100
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-05-12 18:11:16 -0300
commit466c1eb07f42bd27825af24d86b46d05e5e350b9 (patch)
tree3fb966987c51f21b04a7bf60ee5c0b97f437b57c /tools
parent85a9fb47c56aa5e43c54034002232c0585a4b781 (diff)
downloadop-kernel-dev-466c1eb07f42bd27825af24d86b46d05e5e350b9.zip
op-kernel-dev-466c1eb07f42bd27825af24d86b46d05e5e350b9.tar.gz
perf tools: Use getconf to determine number of online CPUs
Parsing /proc/cpuinfo is a fiddly, arch-dependent business and a 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@arm.com> Acked-by: Jiri Olsa <jolsa@kernel.org> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: David Ahern <david.ahern@oracle.com> Cc: Mark Rutland <Mark.Rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Link: http://lkml.kernel.org/r/20150423140454.GJ1652@arm.com [ Made it fall back to parsing /proc when getconf not found ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index c699dc3..d31a7bb 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[0-9]' /proc/cpuinfo) 2>/dev/null)
ifeq ($(JOBS),0)
JOBS := 1
endif
OpenPOWER on IntegriCloud