diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-07-30 14:51:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-07-30 14:51:06 +0200 |
| commit | f9b9f812235d53f774a083e88a5a23b517a69752 (patch) | |
| tree | 3f56a1a1e1e561e25317c7c3ede127d509961ffa /tools | |
| parent | 068f1d3f45546f4bb24e9be67231db1be296f0c8 (diff) | |
| parent | 8578b891ec38c39abd5d6376afd05fce78e2628c (diff) | |
| download | linux-f9b9f812235d53f774a083e88a5a23b517a69752.tar.bz2 | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core
Pull perf/core improvements and fixes from Jiri Olsa:
* Fix perf usage string leftover (Jiri Olsa)
* Revert "perf tools: Fix jump label always changing during tracing" (Jiri Olsa)
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/perf.c | 2 | ||||
| -rw-r--r-- | tools/perf/util/cloexec.c | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/tools/perf/perf.c b/tools/perf/perf.c index eed3fb2a3af0..2282d41879a2 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -18,7 +18,7 @@ #include <pthread.h> const char perf_usage_string[] = - "perf [--version] [--debug variable[=VALUE]] [--help] COMMAND [ARGS]"; + "perf [--version] [--help] [OPTIONS] COMMAND [ARGS]"; const char perf_more_info_string[] = "See 'perf help COMMAND' for more information on a specific command."; diff --git a/tools/perf/util/cloexec.c b/tools/perf/util/cloexec.c index 6a37be53a5d2..c5d05ec17220 100644 --- a/tools/perf/util/cloexec.c +++ b/tools/perf/util/cloexec.c @@ -1,4 +1,3 @@ -#include <sched.h> #include "util.h" #include "../perf.h" #include "cloexec.h" @@ -15,13 +14,9 @@ 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, -1, cpu, -1, + fd = sys_perf_event_open(&attr, 0, -1, -1, PERF_FLAG_FD_CLOEXEC); err = errno; @@ -35,7 +30,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, -1, cpu, -1, 0); + fd = sys_perf_event_open(&attr, 0, -1, -1, 0); err = errno; if (WARN_ONCE(fd < 0, |