Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...

[firefly-linux-kernel-4.4.55.git] / kernel / trace / trace_events_trigger.c

diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
index 8efbb69b04f00199e090b9e5fce7ea9feafdebaa..925f537f07d17db7caae363dd39a20bd2296d2ee 100644 (file)
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -1095,7 +1095,7 @@ event_enable_trigger_print(struct seq_file *m, struct event_trigger_ops *ops,
        seq_printf(m, "%s:%s:%s",
                   enable_data->enable ? ENABLE_EVENT_STR : DISABLE_EVENT_STR,
                   enable_data->file->event_call->class->system,
-                  enable_data->file->event_call->name);
+                  ftrace_event_name(enable_data->file->event_call));
 
        if (data->count == -1)
                seq_puts(m, ":unlimited");