apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ingo Molnar
2014-07-30 14:51:06 +02:00
parent 068f1d3f45 8578b891ec
commit f9b9f81223
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/perf/perf.c
+1 -1
View File
@@ -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.";
tools/perf/util/cloexec.c
+2 -7
View File
@@ -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,