perf/urgent fix

Hi Ingo,

Please consider pulling,

- Arnaldo

The following changes since commit 0f02adaa49af23ab9fa05375f4a237da6014401b:

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2015-06-20 01:07:02 +0200)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo

for you to fetch changes up to 2b42b09b88c831ba4da2d669581dde371c38c2af:

perf bench numa: Fix to show proper convergence stats (2015-06-25 12:28:35 -0300)

----------------------------------------------------------------
perf/urgent fix:

- Fix to show proper convergence stats in 'perf bench numa' (Srikar Dronamraju)

----------------------------------------------------------------
Srikar Dronamraju (1):
perf bench numa: Fix to show proper convergence stats

 tools/perf/util/cloexec.c | 4 ++++
 1 file changed, 4 insertions(+)

From: Srikar Dronamraju <[email protected]>

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

---
 tools/perf/util/cloexec.c | 4 ++++
 1 file changed, 4 insertions(+)

index 85b523885f9d..2babddaa2481 100644
@@ -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)
 {

2.1.0

Pulled, thanks Arnaldo!

Ingo