diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-12-25 10:43:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-12-25 10:43:08 +0100 |
| commit | 46f5cfc13d54962097cb0cc5f97593e2a98a6aed (patch) | |
| tree | 1ec5da58e3d085a7e358a4b7adf3b6e6b7ce1753 /kernel/trace/trace_events_hist.c | |
| parent | Linux 5.5-rc3 (diff) | |
| parent | Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts (diff) | |
| download | linux-46f5cfc13d54962097cb0cc5f97593e2a98a6aed.tar.xz linux-46f5cfc13d54962097cb0cc5f97593e2a98a6aed.zip | |
Merge branch 'core/kprobes' into perf/core, to pick up a completed branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_events_hist.c')
| -rw-r--r-- | kernel/trace/trace_events_hist.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index f62de5f43e79..ce376c78439f 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -1154,6 +1154,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; @@ -1175,7 +1181,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) { |