Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91220134 authored by Tom Zanussi's avatar Tom Zanussi Committed by Steven Rostedt (VMware)
Browse files

tracing: Remove hist trigger synth_var_refs 

All var_refs are now handled uniformly and there's no reason to treat
the synth_refs in a special way now, so remove them and associated
functions.

Link: http://lkml.kernel.org/r/b4d3470526b8f0426dcec125399dad9ad9b8589d.1545161087.git.tom.zanussi@linux.intel.com



Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Reviewed-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarTom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 656fe2ba

kernel/trace/trace_events_hist.c

+0 −18
Original line number Diff line number Diff line
@@ -279,8 +279,6 @@ struct hist_trigger_data { 
	struct action_data		*actions[HIST_ACTIONS_MAX];

	unsigned int			n_actions;



	struct hist_field               *synth_var_refs[SYNTH_FIELDS_MAX];

	unsigned int                    n_synth_var_refs;

	struct field_var		*field_vars[SYNTH_FIELDS_MAX];

	unsigned int			n_field_vars;

	unsigned int			n_field_var_str;
@@ -3599,20 +3597,6 @@ static void save_field_var(struct hist_trigger_data *hist_data, 
}





static void destroy_synth_var_refs(struct hist_trigger_data *hist_data)

{

	unsigned int i;



	for (i = 0; i < hist_data->n_synth_var_refs; i++)

		destroy_hist_field(hist_data->synth_var_refs[i], 0);

}



static void save_synth_var_ref(struct hist_trigger_data *hist_data,

			 struct hist_field *var_ref)

{

	hist_data->synth_var_refs[hist_data->n_synth_var_refs++] = var_ref;

}



static int check_synth_field(struct synth_event *event,

			     struct hist_field *hist_field,

			     unsigned int field_pos)
@@ -3772,7 +3756,6 @@ static int onmatch_create(struct hist_trigger_data *hist_data, 
				goto err;

			}



			save_synth_var_ref(hist_data, var_ref);

			field_pos++;

			kfree(p);

			continue;
@@ -4516,7 +4499,6 @@ static void destroy_hist_data(struct hist_trigger_data *hist_data) 
	destroy_actions(hist_data);

	destroy_field_vars(hist_data);

	destroy_field_var_hists(hist_data);

	destroy_synth_var_refs(hist_data);



	kfree(hist_data);

}