Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9b9f812 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

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: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 068f1d3f 8578b891

tools/perf/perf.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line 
#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,