From 4d88924f5f429cff503f31b3d24157b31e1b0efe Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Tue, 1 Dec 2009 16:23:20 +0800
Subject: [PATCH] --- yaml --- r: 169839 b: refs/heads/master c:
 bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34 h: refs/heads/master i:   169837:
 56e83970d7969787cda15bd8d753fb5e3b48794e   169835:
 c55630b39c82c2e1c1265ee85dd95ba016aeec83   169831:
 4fc34eb606cd86ce130daa9f4d5a8874270ca242   169823:
 8b27dfda366b2e1678c46ef047ba7231ec58254a v: v3

---
 [refs]                              | 2 +-
 trunk/include/linux/syscalls.h      | 4 ++--
 trunk/include/trace/syscall.h       | 2 --
 trunk/kernel/trace/trace_syscalls.c | 8 --------
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 952157fd17c6..b38a1cd0ed7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59d069eb5ae9b033ed1c124c92e1532c4a958991
+refs/heads/master: bf56a4ea9f1683c5b223fd3a5dbea23f1fa91c34
diff --git a/trunk/include/linux/syscalls.h b/trunk/include/linux/syscalls.h
index b50974a93af0..2f7c539ab96d 100644
--- a/trunk/include/linux/syscalls.h
+++ b/trunk/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/trunk/include/trace/syscall.h b/trunk/include/trace/syscall.h
index 51ee17d3632a..5f8827c92db7 100644
--- a/trunk/include/trace/syscall.h
+++ b/trunk/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/trunk/kernel/trace/trace_syscalls.c b/trunk/kernel/trace/trace_syscalls.c
index 63aa8070365d..00d6e176f5b6 100644
--- a/trunk/kernel/trace/trace_syscalls.c
+++ b/trunk/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;