From 325f5091b0da5a7d8d190262661af17d75bee262 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Wed, 19 Jul 2017 15:02:43 -0300 Subject: [PATCH] perf trace: Ditch __syscall__arg_val() variant, not needed anymore All callers now can use syscall__arg_val(arg, idx), be it to iterate thru the syscall arguments while taking into account alignment, or to get values for other arguments that affect how the current argument should be formatted (think of fcntl's 'cmd' and 'arg' arguments). Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-wm5b156d8kro1r4y3b33eyta@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index fc4d33a6aa58..f8b7bfdf4ee7 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -1336,20 +1336,15 @@ static int trace__validate_ev_qualifier(struct trace *trace) * variable to read it. Most notably this avoids extended load instructions * on unaligned addresses */ -static unsigned long __syscall_arg__val(unsigned char *args, u8 idx) +unsigned long syscall_arg__val(struct syscall_arg *arg, u8 idx) { unsigned long val; - unsigned char *p = args + sizeof(unsigned long) * idx; + unsigned char *p = arg->args + sizeof(unsigned long) * idx; memcpy(&val, p, sizeof(val)); return val; } -unsigned long syscall_arg__val(struct syscall_arg *arg, u8 idx) -{ - return __syscall_arg__val(arg->args, idx); -} - static size_t syscall__scnprintf_val(struct syscall *sc, char *bf, size_t size, struct syscall_arg *arg, unsigned long val) { -- 2.45.2