aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_events.c2
-rw-r--r--kernel/trace/trace_export.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index b568ade8f453..af8fb8ebef0b 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -941,7 +941,7 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events,
941 id); 941 id);
942 942
943 if (call->define_fields) { 943 if (call->define_fields) {
944 ret = call->define_fields(); 944 ret = call->define_fields(call);
945 if (ret < 0) { 945 if (ret < 0) {
946 pr_warning("Could not initialize trace point" 946 pr_warning("Could not initialize trace point"
947 " events/%s\n", call->name); 947 " events/%s\n", call->name);
diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c
index 956d4bc675e5..cf2c752a25bf 100644
--- a/kernel/trace/trace_export.c
+++ b/kernel/trace/trace_export.c
@@ -119,7 +119,7 @@ ftrace_format_##call(struct ftrace_event_call *unused, \
119 119
120#undef TRACE_EVENT_FORMAT 120#undef TRACE_EVENT_FORMAT
121#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt) \ 121#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt) \
122int ftrace_define_fields_##call(void); \ 122int ftrace_define_fields_##call(struct ftrace_event_call *event_call); \
123static int ftrace_raw_init_event_##call(void); \ 123static int ftrace_raw_init_event_##call(void); \
124 \ 124 \
125struct ftrace_event_call __used \ 125struct ftrace_event_call __used \
@@ -184,9 +184,8 @@ __attribute__((section("_ftrace_events"))) event_##call = { \
184#undef TRACE_EVENT_FORMAT 184#undef TRACE_EVENT_FORMAT
185#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt) \ 185#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt) \
186int \ 186int \
187ftrace_define_fields_##call(void) \ 187ftrace_define_fields_##call(struct ftrace_event_call *event_call) \
188{ \ 188{ \
189 struct ftrace_event_call *event_call = &event_##call; \
190 struct args field; \ 189 struct args field; \
191 int ret; \ 190 int ret; \
192 \ 191 \