trace_syscalls: Remove duplicate init_enter_##sname()

use only one init_syscall_trace instead of
many init_enter_##sname()/init_exit_##sname()

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: Jason Baron <jbaron@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <4B14D29B.6090708@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 3 insertions, 28 deletions

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 3c280d7ecb76..cf0d923ea40e 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -158,19 +158,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused)     \
         struct trace_event enter_syscall_print_##sname = {              \
                 .trace                  = print_syscall_enter,          \
         };                                                              \
-        static int init_enter_##sname(struct ftrace_event_call *call)   \
-        {                                                               \
-                int num, id;                                            \
-                num = __syscall_meta_##sname.syscall_nr;                \
-                if (num < 0)                                            \
-                        return -ENOSYS;                                 \
-                id = register_ftrace_event(&enter_syscall_print_##sname);\
-                if (!id)                                                \
-                        return -ENODEV;                                 \
-                event_enter_##sname.id = id;                            \
-                INIT_LIST_HEAD(&event_enter_##sname.fields);            \
-                return 0;                                               \
-        }                                                               \
         TRACE_SYS_ENTER_PROFILE(sname);                                 \
         static struct ftrace_event_call __used                          \
           __attribute__((__aligned__(4)))                               \
@@ -179,7 +166,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused)     \
                 .name                   = "sys_enter"#sname,            \
                 .system                 = "syscalls",                   \
                 .event                  = &enter_syscall_print_##sname, \
-                .raw_init               = init_enter_##sname,           \
+                .raw_init               = init_syscall_trace,           \
                 .show_format            = syscall_enter_format,         \
                 .define_fields          = syscall_enter_define_fields,  \
                 .regfunc                = reg_event_syscall_enter,      \
@@ -194,19 +181,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused)     \
         struct trace_event exit_syscall_print_##sname = {               \
                 .trace                  = print_syscall_exit,           \
         };                                                              \
-        static int init_exit_##sname(struct ftrace_event_call *call)    \
-        {                                                               \
-                int num, id;                                            \
-                num = __syscall_meta_##sname.syscall_nr;                \
-                if (num < 0)                                            \
-                        return -ENOSYS;                                 \
-                id = register_ftrace_event(&exit_syscall_print_##sname);\
-                if (!id)                                                \
-                        return -ENODEV;                                 \
-                event_exit_##sname.id = id;                             \
-                INIT_LIST_HEAD(&event_exit_##sname.fields);             \
-                return 0;                                               \
-        }                                                               \
         TRACE_SYS_EXIT_PROFILE(sname);                                  \
         static struct ftrace_event_call __used                          \
           __attribute__((__aligned__(4)))                               \
@@ -215,7 +189,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused)     \
                 .name                   = "sys_exit"#sname,             \
                 .system                 = "syscalls",                   \
                 .event                  = &exit_syscall_print_##sname,  \
-                .raw_init               = init_exit_##sname,            \
+                .raw_init               = init_syscall_trace,           \
                 .show_format            = syscall_exit_format,          \
                 .define_fields          = syscall_exit_define_fields,   \
                 .regfunc                = reg_event_syscall_exit,       \
diff --git a/include/trace/syscall.h b/include/trace/syscall.h
index 1531eef3071f..dff9371e5274 100644
--- a/include/trace/syscall.h
+++ b/include/trace/syscall.h
@@ -32,6 +32,7 @@ struct syscall_metadata {
 
 #ifdef CONFIG_FTRACE_SYSCALLS
 extern unsigned long arch_syscall_addr(int nr);
+extern int init_syscall_trace(struct ftrace_event_call *call);
 
 extern int syscall_enter_format(struct ftrace_event_call *call,
                                 struct trace_seq *s);