redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

perf/core improvements and fixes: 

. 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>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJT1mDqAAoJEPZqUSBWB3s96nEQAMGQ45usHOhiPjUE/wtfDXi5
 pzcB7+MZrpRvT6B4MfsWiDV/rp82JwxtqvMThO2ew34eMvu6iTbImlu9O0SiHUY+
 TdDmDkyBzrB8+IlfzHaImxdOHhjHbr4R4WeZOG7OIin69QMrD8GFkSQ5BW8r7k/O
 kVGai2sAAL06gQc0iWyN8q7haavz6t1iSiOfHSS0l8Pn/TiIdAA6EX8fWVGcsJFU
 k0wB0pYI6dgZsnL7YfTJPhERVLc6fjkAN5sbfuFxNmnDq5uXDbA0aEcvfdlrisMv
 2XlV28R8VBaq1enJdqMdwQ5rkMfoZOANUQ7HcIPoFV5WunXcIX0zOh0mDnhWLGqY
 9IDO8XZrpaN0/4CvIt8lB4i9OrBljkhnhWZgsgk0ZY2xqy0svMsnL1IZQ3wvp5dr
 gYLNLEYgc1pH8DGNObsWJ6S5fCgy726zkiRJF2x9aMOZeCpLxavrRwZyQuDQWk1C
 VSU//b6aYyYyho/UEyRZXwfRWXp8Pzgzz9hWzUUJQPHyJOyfZbAyxLAdgJcEno6z
 BC0cHrbqOy4COzMfPmj9L4LP++vf/M03LO88ywVtDwFfp8ww3Tent3AhWVSbfLWq
 v5AmnPlktI/Tv8W90JT66JdwwGFtwPmjVxoiI01SjsMzxOoOdDsdA7WZtonoq7xL
 FgX3/yNioiN0RIweHMB9
 =BMXE
 -----END PGP SIGNATURE-----

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>
wifi-calibration
Ingo Molnar 2014-07-30 14:51:06 +02:00
parent 068f1d3f45 8578b891ec
commit f9b9f81223
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/perf.c
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.";

9
tools/perf/util/cloexec.c
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,