aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ftrace_event.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/ftrace_event.h')
-rw-r--r--include/linux/ftrace_event.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index c0f4b364c711..c8091001b943 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -132,6 +132,7 @@ struct ftrace_event_call {
132 void *data; 132 void *data;
133 133
134 int perf_refcount; 134 int perf_refcount;
135 void *perf_data;
135 int (*perf_event_enable)(struct ftrace_event_call *); 136 int (*perf_event_enable)(struct ftrace_event_call *);
136 void (*perf_event_disable)(struct ftrace_event_call *); 137 void (*perf_event_disable)(struct ftrace_event_call *);
137}; 138};
@@ -190,7 +191,7 @@ struct perf_event;
190 191
191DECLARE_PER_CPU(struct pt_regs, perf_trace_regs); 192DECLARE_PER_CPU(struct pt_regs, perf_trace_regs);
192 193
193extern int perf_trace_enable(int event_id); 194extern int perf_trace_enable(int event_id, void *data);
194extern void perf_trace_disable(int event_id); 195extern void perf_trace_disable(int event_id);
195extern int ftrace_profile_set_filter(struct perf_event *event, int event_id, 196extern int ftrace_profile_set_filter(struct perf_event *event, int event_id,
196 char *filter_str); 197 char *filter_str);
@@ -201,11 +202,12 @@ perf_trace_buf_prepare(int size, unsigned short type, int *rctxp,
201 202
202static inline void 203static inline void
203perf_trace_buf_submit(void *raw_data, int size, int rctx, u64 addr, 204perf_trace_buf_submit(void *raw_data, int size, int rctx, u64 addr,
204 u64 count, unsigned long irq_flags, struct pt_regs *regs) 205 u64 count, unsigned long irq_flags, struct pt_regs *regs,
206 void *event)
205{ 207{
206 struct trace_entry *entry = raw_data; 208 struct trace_entry *entry = raw_data;
207 209
208 perf_tp_event(entry->type, addr, count, raw_data, size, regs); 210 perf_tp_event(entry->type, addr, count, raw_data, size, regs, event);
209 perf_swevent_put_recursion_context(rctx); 211 perf_swevent_put_recursion_context(rctx);
210 local_irq_restore(irq_flags); 212 local_irq_restore(irq_flags);
211} 213}