diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-07-28 10:09:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-07-28 10:09:03 +0200 |
| commit | 068f1d3f45546f4bb24e9be67231db1be296f0c8 (patch) | |
| tree | edd13e6585cc2dbd301760193fd854d653032e34 /tools/perf/util/cloexec.c | |
| parent | f4be073db878d0e79f74bc36f1642847781791a0 (diff) | |
| parent | dcabb507fd3a2b19aed6b4068e2a954f5fd8de45 (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
Infrastructure changes:
o More prep work to support Intel PT: (Adrian Hunter)
- Polishing 'script' BTS output
- 'inject' can specify --kallsym
- VDSO is per machine, not a global var
- Expose data addr lookup functions previously private to 'script'
- Large mmap fixes in events processing
o Fix build on gcc 4.4.7 (Arnaldo Carvalho de Melo)
o Event ordering fixes (Jiri Olsa)
o Include standard stringify macros in power pc code (Sukadev Bhattiprolu)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/cloexec.c')
| -rw-r--r-- | tools/perf/util/cloexec.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/perf/util/cloexec.c b/tools/perf/util/cloexec.c index c5d05ec17220..6a37be53a5d2 100644 --- a/tools/perf/util/cloexec.c +++ b/tools/perf/util/cloexec.c @@ -1,3 +1,4 @@ +#include <sched.h> #include "util.h" #include "../perf.h" #include "cloexec.h" @@ -14,9 +15,13 @@ static int perf_flag_probe(void) }; int fd; int err; + int cpu = sched_getcpu(); + + if (cpu < 0) + cpu = 0; /* check cloexec flag */ - fd = sys_perf_event_open(&attr, 0, -1, -1, + fd = sys_perf_event_open(&attr, -1, cpu, -1, PERF_FLAG_FD_CLOEXEC); err = errno; @@ -30,7 +35,7 @@ static int perf_flag_probe(void) err, strerror(err)); /* not supported, confirm error related to PERF_FLAG_FD_CLOEXEC */ - fd = sys_perf_event_open(&attr, 0, -1, -1, 0); + fd = sys_perf_event_open(&attr, -1, cpu, -1, 0); err = errno; if (WARN_ONCE(fd < 0, |