Skip to content

Commit 524b62f

Browse files
author
Ingo Molnar
committed
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 <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2 parents 4422d80 + 1934adf commit 524b62f

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

tools/perf/util/evsel.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ struct perf_evsel *perf_evsel__new_cycles(void)
273273
struct perf_event_attr attr = {
274274
.type = PERF_TYPE_HARDWARE,
275275
.config = PERF_COUNT_HW_CPU_CYCLES,
276+
.exclude_kernel = 1,
276277
};
277278
struct perf_evsel *evsel;
278279

tools/perf/util/unwind-libunwind.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ int unwind__prepare_access(struct thread *thread, struct map *map,
5050

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

0 commit comments

Comments
 (0)