diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-01-28 07:59:05 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-01-28 07:59:05 +0100 |
commit | 0cc4bd8f70d1ea2940295f1050508c663fe9eff9 (patch) | |
tree | 08013fd80687629430d328cb0721527e256d3bac /kernel/trace | |
parent | 56ee04aa63285d6bc8a995a26e2441ae3d419bcd (diff) | |
parent | 31537cf8f3f95d45360b995ad8be2c870edc5b02 (diff) | |
download | linux-0cc4bd8f70d1ea2940295f1050508c663fe9eff9.tar.bz2 |
Merge branch 'core/kprobes' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace')
-rw-r--r-- | kernel/trace/trace_syscalls.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index 73140d80dd46..2978c29d87d4 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -274,7 +274,8 @@ static int __init syscall_enter_define_fields(struct trace_event_call *call) struct syscall_trace_enter trace; struct syscall_metadata *meta = call->data; int offset = offsetof(typeof(trace), args); - int ret, i; + int ret = 0; + int i; for (i = 0; i < meta->nb_args; i++) { ret = trace_define_field(call, meta->types[i], |