Merge tag 'perf-core-for-mingo-4.11-20170126' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull the latest perf/core updates from Arnaldo Carvalho de Melo: New features: - Introduce 'perf ftrace' a perf front end to the kernel's ftrace function and function_graph tracer, defaulting to the "function_graph" tracer, more work will be done in reviving this effort, forward porting it from its initial patch submission (Namhyung Kim) - Add 'e' and 'c' hotkeys to expand/collapse call chains for a single hist entry in the 'perf report' and 'perf top' TUI (Jiri Olsa) Fixes: - Fix wrong register name for arm64, used in 'perf probe' (He Kuang) - Fix map offsets in relocation in libbpf (Joe Stringer) - Fix looking up dwarf unwind stack info (Matija Glavinic Pecotic) Infrastructure changes: - libbpf prog functions sync with what is exported via uapi (Joe Stringer) Trivial changes: - Remove unnecessary checks and assignments in 'perf probe's try_to_find_absolute_address() (Markus Elfring) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -3023,20 +3023,17 @@ static int try_to_find_absolute_address(struct perf_probe_event *pev,
|
||||
|
||||
tev->nargs = pev->nargs;
|
||||
tev->args = zalloc(sizeof(struct probe_trace_arg) * tev->nargs);
|
||||
if (!tev->args) {
|
||||
err = -ENOMEM;
|
||||
if (!tev->args)
|
||||
goto errout;
|
||||
}
|
||||
|
||||
for (i = 0; i < tev->nargs; i++)
|
||||
copy_to_probe_trace_arg(&tev->args[i], &pev->args[i]);
|
||||
|
||||
return 1;
|
||||
|
||||
errout:
|
||||
if (*tevs) {
|
||||
clear_probe_trace_events(*tevs, 1);
|
||||
*tevs = NULL;
|
||||
}
|
||||
clear_probe_trace_events(*tevs, 1);
|
||||
*tevs = NULL;
|
||||
return err;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user