Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts

[platform/kernel/linux-rpi.git] / kernel / trace / trace_kprobe.c

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 7f89026..cbdc4f4 100644 (file)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1555,16 +1555,28 @@ static struct trace_event_functions kprobe_funcs = {
        .trace          = print_kprobe_event
 };
 
+static struct trace_event_fields kretprobe_fields_array[] = {
+       { .type = TRACE_FUNCTION_TYPE,
+         .define_fields = kretprobe_event_define_fields },
+       {}
+};
+
+static struct trace_event_fields kprobe_fields_array[] = {
+       { .type = TRACE_FUNCTION_TYPE,
+         .define_fields = kprobe_event_define_fields },
+       {}
+};
+
 static inline void init_trace_event_call(struct trace_kprobe *tk)
 {
        struct trace_event_call *call = trace_probe_event_call(&tk->tp);
 
        if (trace_kprobe_is_return(tk)) {
                call->event.funcs = &kretprobe_funcs;
-               call->class->define_fields = kretprobe_event_define_fields;
+               call->class->fields_array = kretprobe_fields_array;
        } else {
                call->event.funcs = &kprobe_funcs;
-               call->class->define_fields = kprobe_event_define_fields;
+               call->class->fields_array = kprobe_fields_array;
        }
 
        call->flags = TRACE_EVENT_FL_KPROBE;