diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-26 10:37:15 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-26 10:37:15 +0200 |
| commit | df0d0da426d03fb7e6567feb38a48b1e0dd1891e (patch) | |
| tree | c50f1338c57a828204e8468242121cc503c95268 /tools/perf | |
| parent | 27451700dfa01a05cdb4d9d74501536165158034 (diff) | |
| parent | 2b42b09b88c831ba4da2d669581dde371c38c2af (diff) | |
| download | linux-df0d0da426d03fb7e6567feb38a48b1e0dd1891e.tar.bz2 | |
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>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/cloexec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/util/cloexec.c b/tools/perf/util/cloexec.c index 85b523885f9d..2babddaa2481 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) { |