Commit df0d0da4 authored by Ingo Molnar's avatar Ingo Molnar

Merge tag 'perf-urgent-for-mingo' of...

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 27451700 2b42b09b
...@@ -7,11 +7,15 @@ ...@@ -7,11 +7,15 @@
static unsigned long flag = PERF_FLAG_FD_CLOEXEC; static unsigned long flag = PERF_FLAG_FD_CLOEXEC;
#ifdef __GLIBC_PREREQ
#if !__GLIBC_PREREQ(2, 6)
int __weak sched_getcpu(void) int __weak sched_getcpu(void)
{ {
errno = ENOSYS; errno = ENOSYS;
return -1; return -1;
} }
#endif
#endif
static int perf_flag_probe(void) static int perf_flag_probe(void)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment