aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_events.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/trace_events.c')
-rw-r--r--kernel/trace/trace_events.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 8e94255a45e7..aafe5bff8f59 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -122,7 +122,7 @@ int trace_event_raw_init(struct ftrace_event_call *call)
122{ 122{
123 int id; 123 int id;
124 124
125 id = register_ftrace_event(call->event); 125 id = register_ftrace_event(&call->event);
126 if (!id) 126 if (!id)
127 return -ENODEV; 127 return -ENODEV;
128 call->id = id; 128 call->id = id;
@@ -1073,8 +1073,8 @@ static void remove_subsystem_dir(const char *name)
1073static void __trace_remove_event_call(struct ftrace_event_call *call) 1073static void __trace_remove_event_call(struct ftrace_event_call *call)
1074{ 1074{
1075 ftrace_event_enable_disable(call, 0); 1075 ftrace_event_enable_disable(call, 0);
1076 if (call->event) 1076 if (call->event.funcs)
1077 __unregister_ftrace_event(call->event); 1077 __unregister_ftrace_event(&call->event);
1078 debugfs_remove_recursive(call->dir); 1078 debugfs_remove_recursive(call->dir);
1079 list_del(&call->list); 1079 list_del(&call->list);
1080 trace_destroy_fields(call); 1080 trace_destroy_fields(call);