From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752056AbbFZIn5 (ORCPT ); Fri, 26 Jun 2015 04:43:57 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52120 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751685AbbFZInx (ORCPT ); Fri, 26 Jun 2015 04:43:53 -0400 Date: Fri, 26 Jun 2015 01:43:27 -0700 From: tip-bot for Srikar Dronamraju Message-ID: Cc: acme@redhat.com, mingo@kernel.org, tglx@linutronix.de, namhyung@kernel.org, jolsa@kernel.org, srikar@linux.vnet.ibm.com, masami.hiramatsu.pt@hitachi.com, vlee@twitter.com, linux-kernel@vger.kernel.org, hpa@zytor.com Reply-To: acme@redhat.com, mingo@kernel.org, namhyung@kernel.org, tglx@linutronix.de, jolsa@kernel.org, masami.hiramatsu.pt@hitachi.com, srikar@linux.vnet.ibm.com, vlee@twitter.com, linux-kernel@vger.kernel.org, hpa@zytor.com In-Reply-To: <20150624111004.GA5220@linux.vnet.ibm.com> References: <20150624111004.GA5220@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf bench numa: Fix to show proper convergence stats Git-Commit-ID: 2b42b09b88c831ba4da2d669581dde371c38c2af 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: 2b42b09b88c831ba4da2d669581dde371c38c2af Gitweb: http://git.kernel.org/tip/2b42b09b88c831ba4da2d669581dde371c38c2af Author: Srikar Dronamraju AuthorDate: Wed, 24 Jun 2015 16:40:04 +0530 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 25 Jun 2015 12:28:35 -0300 perf bench numa: Fix to show proper convergence stats With commit: e1e455f4f4d3 (perf tools: Work around lack of sched_getcpu in glibc < 2.6), perf_bench numa mem with -c or -m option is not able to correctly calculate convergence. With the above commit, sched_getcpu always seems to return -1. The intention of commit e1e455f was to add a sched_getcpu in glibc < 2.6. Hence keep the sched_getcpu definition under an ifdef. This regression happened occurred between v4.0 and v4.1 Signed-off-by: Srikar Dronamraju Acked-by: Ingo Molnar Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Vinson Lee Fixes: e1e455f4f4d3 ("perf tools: Work around lack of sched_getcpu in glibc < 2.6") Link: http://lkml.kernel.org/r/20150624111004.GA5220@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/cloexec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/perf/util/cloexec.c b/tools/perf/util/cloexec.c index 85b5238..2babdda 100644 --- a/tools/perf/util/cloexec.c +++ b/tools/perf/util/cloexec.c @@ -7,11 +7,15 @@ static unsigned long flag = PERF_FLAG_FD_CLOEXEC; +#ifdef __GLIBC_PREREQ +#if !__GLIBC_PREREQ(2, 6) int __weak sched_getcpu(void) { errno = ENOSYS; return -1; } +#endif +#endif static int perf_flag_probe(void) {