Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753960AbbEMGZP (ORCPT ); Wed, 13 May 2015 02:25:15 -0400 Received: from terminus.zytor.com ([198.137.202.10]:58197 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752124AbbEMGZJ (ORCPT ); Wed, 13 May 2015 02:25:09 -0400 Date: Tue, 12 May 2015 23:24:47 -0700 From: tip-bot for Will Deacon Message-ID: Cc: jolsa@kernel.org, Mark.Rutland@arm.com, namhyung@kernel.org, will.deacon@arm.com, tglx@linutronix.de, hpa@zytor.com, david.ahern@oracle.com, mingo@kernel.org, acme@redhat.com, linux-kernel@vger.kernel.org Reply-To: will.deacon@arm.com, tglx@linutronix.de, hpa@zytor.com, david.ahern@oracle.com, mingo@kernel.org, acme@redhat.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, Mark.Rutland@arm.com, namhyung@kernel.org In-Reply-To: <20150423140454.GJ1652@arm.com> References: <20150423140454.GJ1652@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Use getconf to determine number of online CPUs Git-Commit-ID: 466c1eb07f42bd27825af24d86b46d05e5e350b9 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1871 Lines: 46 Commit-ID: 466c1eb07f42bd27825af24d86b46d05e5e350b9 Gitweb: http://git.kernel.org/tip/466c1eb07f42bd27825af24d86b46d05e5e350b9 Author: Will Deacon AuthorDate: Thu, 23 Apr 2015 15:00:16 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 12 May 2015 18:11:16 -0300 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 Acked-by: Jiri Olsa Tested-by: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Mark Rutland Cc: Namhyung Kim 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 --- tools/perf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/