Explorar o código

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fix from Arnaldo Carvalho de Melo:

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

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Ingo Molnar %!s(int64=10) %!d(string=hai) anos
pai
achega
df0d0da426
Modificáronse 1 ficheiros con 4 adicións e 0 borrados
  1. 4 0
      tools/perf/util/cloexec.c

+ 4 - 0
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)
 {