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

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

diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index f49d1a3..23b0195 100644 (file)
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -1135,6 +1135,12 @@ static struct synth_event *find_synth_event(const char *name)
        return NULL;
 }
 
+static struct trace_event_fields synth_event_fields_array[] = {
+       { .type = TRACE_FUNCTION_TYPE,
+         .define_fields = synth_event_define_fields },
+       {}
+};
+
 static int register_synth_event(struct synth_event *event)
 {
        struct trace_event_call *call = &event->call;
@@ -1156,7 +1162,7 @@ static int register_synth_event(struct synth_event *event)
 
        INIT_LIST_HEAD(&call->class->fields);
        call->event.funcs = &synth_event_funcs;
-       call->class->define_fields = synth_event_define_fields;
+       call->class->fields_array = synth_event_fields_array;
 
        ret = register_trace_event(&call->event);
        if (!ret) {