summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/trace_events.h3
-rw-r--r--kernel/trace/trace.h4
-rw-r--r--kernel/trace/trace_events_trigger.c6
3 files changed, 5 insertions, 8 deletions
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index 2bde3eff564c..d1c442d9bd85 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -435,8 +435,7 @@ event_triggers_call(struct trace_event_file *file, void *rec,
435 struct ring_buffer_event *event); 435 struct ring_buffer_event *event);
436extern void 436extern void
437event_triggers_post_call(struct trace_event_file *file, 437event_triggers_post_call(struct trace_event_file *file,
438 enum event_trigger_type tt, 438 enum event_trigger_type tt);
439 void *rec, struct ring_buffer_event *event);
440 439
441bool trace_event_ignore_this_pid(struct trace_event_file *trace_file); 440bool trace_event_ignore_this_pid(struct trace_event_file *trace_file);
442 441
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 507954b4e058..6bfc2467479c 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -1334,7 +1334,7 @@ event_trigger_unlock_commit(struct trace_event_file *file,
1334 trace_buffer_unlock_commit(file->tr, buffer, event, irq_flags, pc); 1334 trace_buffer_unlock_commit(file->tr, buffer, event, irq_flags, pc);
1335 1335
1336 if (tt) 1336 if (tt)
1337 event_triggers_post_call(file, tt, entry, event); 1337 event_triggers_post_call(file, tt);
1338} 1338}
1339 1339
1340/** 1340/**
@@ -1367,7 +1367,7 @@ event_trigger_unlock_commit_regs(struct trace_event_file *file,
1367 irq_flags, pc, regs); 1367 irq_flags, pc, regs);
1368 1368
1369 if (tt) 1369 if (tt)
1370 event_triggers_post_call(file, tt, entry, event); 1370 event_triggers_post_call(file, tt);
1371} 1371}
1372 1372
1373#define FILTER_PRED_INVALID ((unsigned short)-1) 1373#define FILTER_PRED_INVALID ((unsigned short)-1)
diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
index 8b5bdcf64871..d18249683682 100644
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -97,7 +97,6 @@ EXPORT_SYMBOL_GPL(event_triggers_call);
97 * event_triggers_post_call - Call 'post_triggers' for a trace event 97 * event_triggers_post_call - Call 'post_triggers' for a trace event
98 * @file: The trace_event_file associated with the event 98 * @file: The trace_event_file associated with the event
99 * @tt: enum event_trigger_type containing a set bit for each trigger to invoke 99 * @tt: enum event_trigger_type containing a set bit for each trigger to invoke
100 * @rec: The trace entry for the event
101 * 100 *
102 * For each trigger associated with an event, invoke the trigger 101 * For each trigger associated with an event, invoke the trigger
103 * function registered with the associated trigger command, if the 102 * function registered with the associated trigger command, if the
@@ -108,8 +107,7 @@ EXPORT_SYMBOL_GPL(event_triggers_call);
108 */ 107 */
109void 108void
110event_triggers_post_call(struct trace_event_file *file, 109event_triggers_post_call(struct trace_event_file *file,
111 enum event_trigger_type tt, 110 enum event_trigger_type tt)
112 void *rec, struct ring_buffer_event *event)
113{ 111{
114 struct event_trigger_data *data; 112 struct event_trigger_data *data;
115 113
@@ -117,7 +115,7 @@ event_triggers_post_call(struct trace_event_file *file,
117 if (data->paused) 115 if (data->paused)
118 continue; 116 continue;
119 if (data->cmd_ops->trigger_type & tt) 117 if (data->cmd_ops->trigger_type & tt)
120 data->ops->func(data, rec, event); 118 data->ops->func(data, NULL, NULL);
121 } 119 }
122} 120}
123EXPORT_SYMBOL_GPL(event_triggers_post_call); 121EXPORT_SYMBOL_GPL(event_triggers_post_call);