1 files changed, 4 insertions, 11 deletions

diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index ca46339f3009..a1d20421f4b0 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -3713,7 +3713,6 @@ static void track_data_destroy(struct hist_trigger_data *hist_data,
         struct trace_event_file *file = hist_data->event_file;
 
         destroy_hist_field(data->track_data.track_var, 0);
-        destroy_hist_field(data->track_data.var_ref, 0);
 
         if (data->action == ACTION_SNAPSHOT) {
                 struct track_data *track_data;
@@ -5187,7 +5186,6 @@ static void event_hist_trigger(struct event_trigger_data *data, void *rec,
         u64 var_ref_vals[TRACING_MAP_VARS_MAX];
         char compound_key[HIST_KEY_SIZE_MAX];
         struct tracing_map_elt *elt = NULL;
-        struct stack_trace stacktrace;
         struct hist_field *key_field;
         u64 field_contents;
         void *key = NULL;
@@ -5199,14 +5197,9 @@ static void event_hist_trigger(struct event_trigger_data *data, void *rec,
                 key_field = hist_data->fields[i];
 
                 if (key_field->flags & HIST_FIELD_FL_STACKTRACE) {
-                        stacktrace.max_entries = HIST_STACKTRACE_DEPTH;
-                        stacktrace.entries = entries;
-                        stacktrace.nr_entries = 0;
-                        stacktrace.skip = HIST_STACKTRACE_SKIP;
-
-                        memset(stacktrace.entries, 0, HIST_STACKTRACE_SIZE);
-                        save_stack_trace(&stacktrace);
-
+                        memset(entries, 0, HIST_STACKTRACE_SIZE);
+                        stack_trace_save(entries, HIST_STACKTRACE_DEPTH,
+                                         HIST_STACKTRACE_SKIP);
                         key = entries;
                 } else {
                         field_contents = key_field->fn(key_field, elt, rbe, rec);
@@ -5247,7 +5240,7 @@ static void hist_trigger_stacktrace_print(struct seq_file *m,
         unsigned int i;
 
         for (i = 0; i < max_entries; i++) {
-                if (stacktrace_entries[i] == ULONG_MAX)
+                if (!stacktrace_entries[i])
                         return;
 
                 seq_printf(m, "%*c", 1 + spaces, ' ');