1 files changed, 2 insertions, 16 deletions

diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 57501d90096a..75289f372dd2 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -217,10 +217,6 @@ int syscall_enter_define_fields(struct ftrace_event_call *call)
         int i;
         int offset = offsetof(typeof(trace), args);
 
-        ret = trace_define_common_fields(call);
-        if (ret)
-                return ret;
-
         ret = trace_define_field(call, SYSCALL_FIELD(int, nr), FILTER_OTHER);
         if (ret)
                 return ret;
@@ -241,10 +237,6 @@ int syscall_exit_define_fields(struct ftrace_event_call *call)
         struct syscall_trace_exit trace;
         int ret;
 
-        ret = trace_define_common_fields(call);
-        if (ret)
-                return ret;
-
         ret = trace_define_field(call, SYSCALL_FIELD(int, nr), FILTER_OTHER);
         if (ret)
                 return ret;
@@ -333,10 +325,7 @@ int reg_event_syscall_enter(struct ftrace_event_call *call)
         mutex_lock(&syscall_trace_lock);
         if (!sys_refcount_enter)
                 ret = register_trace_sys_enter(ftrace_syscall_enter);
-        if (ret) {
-                pr_info("event trace: Could not activate"
-                                "syscall entry trace point");
-        } else {
+        if (!ret) {
                 set_bit(num, enabled_enter_syscalls);
                 sys_refcount_enter++;
         }
@@ -370,10 +359,7 @@ int reg_event_syscall_exit(struct ftrace_event_call *call)
         mutex_lock(&syscall_trace_lock);
         if (!sys_refcount_exit)
                 ret = register_trace_sys_exit(ftrace_syscall_exit);
-        if (ret) {
-                pr_info("event trace: Could not activate"
-                                "syscall exit trace point");
-        } else {
+        if (!ret) {
                 set_bit(num, enabled_exit_syscalls);
                 sys_refcount_exit++;
         }