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

Commit 1922eec4 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-4.13-20170710' of... 

Merge tag 'perf-urgent-for-mingo-4.13-20170710' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

 - Fix attr.exclude_kernel setting for default cycles:p (Arnaldo Carvalho de Melo)

 - Fix broken arrow at row 0 connecting jmp instruction to its target in
   the annotate TUI (Jin Yao)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents dbf58062 80f62589

tools/perf/ui/browser.c

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ static void __ui_browser__line_arrow_down(struct ui_browser *browser, 
		ui_browser__gotorc(browser, row, column + 1);

		SLsmg_draw_hline(2);



		if (row++ == 0)

		if (++row == 0)

			goto out;

	} else

		row = 0;

tools/perf/util/evsel.c

+5 −3
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ struct perf_evsel *perf_evsel__new_cycles(void) 
	struct perf_event_attr attr = {

		.type	= PERF_TYPE_HARDWARE,

		.config	= PERF_COUNT_HW_CPU_CYCLES,

		.exclude_kernel	= 1,

		.exclude_kernel	= geteuid() != 0,

	};

	struct perf_evsel *evsel;
@@ -298,8 +298,10 @@ struct perf_evsel *perf_evsel__new_cycles(void) 
		goto out;



	/* use asprintf() because free(evsel) assumes name is allocated */

	if (asprintf(&evsel->name, "cycles%.*s",

		     attr.precise_ip ? attr.precise_ip + 1 : 0, ":ppp") < 0)

	if (asprintf(&evsel->name, "cycles%s%s%.*s",

		     (attr.precise_ip || attr.exclude_kernel) ? ":" : "",

		     attr.exclude_kernel ? "u" : "",

		     attr.precise_ip ? attr.precise_ip + 1 : 0, "ppp") < 0)

		goto error_free;

out:

	return evsel;