trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit

fix event_enter_##sname->event
fix event_exit_##sname->event

remove unused event_syscall_enter and event_syscall_exit

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: <4B14D278.4090209@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index b50974a93af0b83d2c1e3a826f4bdc6a8848ba62..2f7c539ab96d3e75c4e5a8e1f89b4ca5f2b1a7d3 100644 (file)
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -178,7 +178,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused)     \
          event_enter_##sname = {                                       \
                .name                   = "sys_enter"#sname,            \
                .system                 = "syscalls",                   \
-               .event                  = &event_syscall_enter,         \
+               .event                  = &enter_syscall_print_##sname, \
                .raw_init               = init_enter_##sname,           \
                .show_format            = syscall_enter_format,         \
                .define_fields          = syscall_enter_define_fields,  \
@@ -214,7 +214,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused)     \
          event_exit_##sname = {                                        \
                .name                   = "sys_exit"#sname,             \
                .system                 = "syscalls",                   \
-               .event                  = &event_syscall_exit,          \
+               .event                  = &exit_syscall_print_##sname,  \
                .raw_init               = init_exit_##sname,            \
                .show_format            = syscall_exit_format,          \
                .define_fields          = syscall_exit_define_fields,   \

diff --git a/include/trace/syscall.h b/include/trace/syscall.h
index 51ee17d3632a4800dd06fa879a7d6bf92605ea71..5f8827c92db7e673a8d6e5c8aead370d3150d690 100644 (file)
--- a/include/trace/syscall.h
+++ b/include/trace/syscall.h
@@ -37,8 +37,6 @@ extern unsigned long arch_syscall_addr(int nr);
 extern int syscall_name_to_nr(char *name);
 void set_syscall_enter_id(int num, int id);
 void set_syscall_exit_id(int num, int id);
-extern struct trace_event event_syscall_enter;
-extern struct trace_event event_syscall_exit;
 
 extern int syscall_enter_format(struct ftrace_event_call *call,
                                struct trace_seq *s);

diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 63aa8070365d882b9b9bc546d266755d35b330a0..00d6e176f5b6b20012352412a33de13c9ec51e12 100644 (file)
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -444,14 +444,6 @@ void unreg_event_syscall_exit(struct ftrace_event_call *call)
        mutex_unlock(&syscall_trace_lock);
 }
 
-struct trace_event event_syscall_enter = {
-       .trace                  = print_syscall_enter,
-};
-
-struct trace_event event_syscall_exit = {
-       .trace                  = print_syscall_exit,
-};
-
 int __init init_ftrace_syscalls(void)
 {
        struct syscall_metadata *meta;