2 files changed, 8 insertions, 8 deletions

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 207466a49f3d..ed353d274a77 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -143,7 +143,7 @@ struct perf_event_attr;
                 .name                   = "sys_enter"#sname,            \
                 .system                 = "syscalls",                   \
                 .event                  = &enter_syscall_print_##sname, \
-                .raw_init               = trace_event_raw_init,         \
+                .raw_init               = init_syscall_trace,           \
                 .show_format            = syscall_enter_format,         \
                 .define_fields          = syscall_enter_define_fields,  \
                 .regfunc                = reg_event_syscall_enter,      \
@@ -165,7 +165,7 @@ struct perf_event_attr;
                 .name                   = "sys_exit"#sname,             \
                 .system                 = "syscalls",                   \
                 .event                  = &exit_syscall_print_##sname,  \
-                .raw_init               = trace_event_raw_init,         \
+                .raw_init               = init_syscall_trace,           \
                 .show_format            = syscall_exit_format,          \
                 .define_fields          = syscall_exit_define_fields,   \
                 .regfunc                = reg_event_syscall_exit,       \
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 1352b0a36fac..a78e86349ecb 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -450,14 +450,14 @@ int init_syscall_trace(struct ftrace_event_call *call)
         if (set_syscall_print_fmt(call) < 0)
                 return -ENOMEM;
 
-        id = register_ftrace_event(call->event);
-        if (!id) {
+        id = trace_event_raw_init(call);
+
+        if (id < 0) {
                 free_syscall_print_fmt(call);
-                return -ENODEV;
+                return id;
         }
-        call->id = id;
-        INIT_LIST_HEAD(&call->fields);
-        return 0;
+
+        return id;
 }
 
 int __init init_ftrace_syscalls(void)