From: Douglas Raillard <[email protected]> Rename the frehsly exposed trace_synth() to synth_event_trace2() to comply with the existing naming convention. Since synth_event_trace() already exists (and operates on a "struct trace_event_file *"), use a new name for it.
Signed-off-by: Douglas Raillard <[email protected]> --- include/linux/trace_events.h | 2 +- kernel/trace/trace_events_hist.c | 2 +- kernel/trace/trace_events_synth.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index e069d84a73f0..753ce8aecfe4 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -521,7 +521,7 @@ struct synth_event; extern struct synth_event *synth_event_find(const char *name); -extern void trace_synth(struct synth_event *event, u64 *var_ref_vals, +extern void synth_event_trace2(struct synth_event *event, u64 *var_ref_vals, unsigned int *var_ref_idx); extern int synth_event_delete(const char *name); diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index 7067f6fedb1a..ee0fee123c91 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -822,7 +822,7 @@ static void action_trace(struct hist_trigger_data *hist_data, { struct synth_event *event = data->synth_event; - trace_synth(event, var_ref_vals, data->var_ref_idx); + synth_event_trace2(event, var_ref_vals, data->var_ref_idx); } struct hist_var_data { diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c index 4a9a44d37ffc..8837aa258479 100644 --- a/kernel/trace/trace_events_synth.c +++ b/kernel/trace/trace_events_synth.c @@ -850,7 +850,7 @@ EXPORT_SYMBOL_GPL(synth_event_find); typedef void (*synth_probe_func_t) (void *__data, u64 *var_ref_vals, unsigned int *var_ref_idx); -void trace_synth(struct synth_event *event, u64 *var_ref_vals, +void synth_event_trace2(struct synth_event *event, u64 *var_ref_vals, unsigned int *var_ref_idx) { struct tracepoint *tp = event->tp; @@ -873,7 +873,7 @@ void trace_synth(struct synth_event *event, u64 *var_ref_vals, } } } -EXPORT_SYMBOL_GPL(trace_synth); +EXPORT_SYMBOL_GPL(synth_event_trace2); static struct trace_event_fields synth_event_fields_array[] = { { .type = TRACE_FUNCTION_TYPE, -- 2.43.0
