diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ftrace_event.h | 2 | ||||
-rw-r--r-- | include/trace/ftrace.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h index 189806b6e69e..35b3a4a5ba86 100644 --- a/include/linux/ftrace_event.h +++ b/include/linux/ftrace_event.h | |||
@@ -118,7 +118,7 @@ struct ftrace_event_call { | |||
118 | int (*raw_init)(void); | 118 | int (*raw_init)(void); |
119 | int (*show_format)(struct ftrace_event_call *call, | 119 | int (*show_format)(struct ftrace_event_call *call, |
120 | struct trace_seq *s); | 120 | struct trace_seq *s); |
121 | int (*define_fields)(void); | 121 | int (*define_fields)(struct ftrace_event_call *); |
122 | struct list_head fields; | 122 | struct list_head fields; |
123 | int filter_active; | 123 | int filter_active; |
124 | struct event_filter *filter; | 124 | struct event_filter *filter; |
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index b250b0616571..4e81c9b37515 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h | |||
@@ -294,10 +294,9 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags) \ | |||
294 | #undef TRACE_EVENT | 294 | #undef TRACE_EVENT |
295 | #define TRACE_EVENT(call, proto, args, tstruct, func, print) \ | 295 | #define TRACE_EVENT(call, proto, args, tstruct, func, print) \ |
296 | int \ | 296 | int \ |
297 | ftrace_define_fields_##call(void) \ | 297 | ftrace_define_fields_##call(struct ftrace_event_call *event_call) \ |
298 | { \ | 298 | { \ |
299 | struct ftrace_raw_##call field; \ | 299 | struct ftrace_raw_##call field; \ |
300 | struct ftrace_event_call *event_call = &event_##call; \ | ||
301 | int ret; \ | 300 | int ret; \ |
302 | \ | 301 | \ |
303 | __common_field(int, type, 1); \ | 302 | __common_field(int, type, 1); \ |