Commit 524b62fd authored Jul 05, 2017 by Ingo Molnar

Merge tag 'perf-urgent-for-mingo-4.12-20170704' of...

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

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

User visible changes:

 - Fix max attr.precise_ip probing to make perf use the best cycles:p
   available in the processor for non root users (Arnaldo Carvalho de Melo)

 - Fix processing of MMAP events for 32-bit binaries on 64-bit systems
   when unwind support is not fully integrated, fixing DSO and symbol
   resolution (Jiri Olsa)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents 4422d80e 1934adf7

tools/perf/util/evsel.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -273,6 +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,
		};
		struct perf_evsel *evsel;

tools/perf/util/unwind-libunwind.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ int unwind__prepare_access(struct thread thread, struct map map,

		if (!ops) {
		pr_err("unwind: target platform=%s is not supported\n", arch);
		return -1;
		return 0;
		}
		out_register:
		unwind__register_ops(thread, ops);