Merge remote-tracking branch 'asoc/topic/sti' into asoc-next

[deliverable/linux.git] / include / linux / trace_events.h

diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index 925730bc9fc1bb4914410779bdf5ea469ed41c18..0810f81b6db2dfedf86d11972d241bb38c21b006 100644 (file)
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -15,16 +15,6 @@ struct tracer;
 struct dentry;
 struct bpf_prog;
 
-struct trace_print_flags {
-       unsigned long           mask;
-       const char              *name;
-};
-
-struct trace_print_flags_u64 {
-       unsigned long long      mask;
-       const char              *name;
-};
-
 const char *trace_print_flags_seq(struct trace_seq *p, const char *delim,
                                  unsigned long flags,
                                  const struct trace_print_flags *flag_array);
@@ -430,7 +420,8 @@ extern int call_filter_check_discard(struct trace_event_call *call, void *rec,
 extern enum event_trigger_type event_triggers_call(struct trace_event_file *file,
                                                   void *rec);
 extern void event_triggers_post_call(struct trace_event_file *file,
-                                    enum event_trigger_type tt);
+                                    enum event_trigger_type tt,
+                                    void *rec);
 
 bool trace_event_ignore_this_pid(struct trace_event_file *trace_file);
 
@@ -517,7 +508,7 @@ event_trigger_unlock_commit(struct trace_event_file *file,
                trace_buffer_unlock_commit(file->tr, buffer, event, irq_flags, pc);
 
        if (tt)
-               event_triggers_post_call(file, tt);
+               event_triggers_post_call(file, tt, entry);
 }
 
 /**
@@ -550,7 +541,7 @@ event_trigger_unlock_commit_regs(struct trace_event_file *file,
                                                irq_flags, pc, regs);
 
        if (tt)
-               event_triggers_post_call(file, tt);
+               event_triggers_post_call(file, tt, entry);
 }
 
 #ifdef CONFIG_BPF_EVENTS