From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753532AbbC0Hkz (ORCPT ); Fri, 27 Mar 2015 03:40:55 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34070 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753177AbbC0Hks (ORCPT ); Fri, 27 Mar 2015 03:40:48 -0400 Date: Fri, 27 Mar 2015 00:40:35 -0700 From: tip-bot for David Ahern Message-ID: Cc: david.ahern@oracle.com, mingo@kernel.org, acme@redhat.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, hpa@zytor.com, tglx@linutronix.de, namhyung@kernel.org Reply-To: tglx@linutronix.de, hpa@zytor.com, namhyung@kernel.org, mingo@kernel.org, david.ahern@oracle.com, acme@redhat.com, linux-kernel@vger.kernel.org, jolsa@kernel.org In-Reply-To: <1427213455-127249-1-git-send-email-david.ahern@oracle.com> References: <1427213455-127249-1-git-send-email-david.ahern@oracle.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Set JOBS based on CPU or processor Git-Commit-ID: 6428c59a97de7c3d88fc4e66317daea5e5008758 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 Commit-ID: 6428c59a97de7c3d88fc4e66317daea5e5008758 Gitweb: http://git.kernel.org/tip/6428c59a97de7c3d88fc4e66317daea5e5008758 Author: David Ahern AuthorDate: Tue, 24 Mar 2015 12:10:55 -0400 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 26 Mar 2015 10:52:28 -0300 perf tools: Set JOBS based on CPU or processor Number of JOBS to use is set automatically to the number of processors found in /proc/cpuinfo. SPARC uses 'CPU' lines rather than 'processor'. Update the check in perf's Makefile to work for SPARC. Signed-off-by: David Ahern Acked-by: Jiri Olsa Cc: Namhyung Kim Link: http://lkml.kernel.org/r/1427213455-127249-1-git-send-email-david.ahern@oracle.com 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 d5020ae..c699dc3 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 grep -c ^processor /proc/cpuinfo 2>/dev/null) + JOBS := $(shell egrep -c '^processor|^CPU' /proc/cpuinfo 2>/dev/null) ifeq ($(JOBS),0) JOBS := 1 endif