From 622f4cb71a4fd2c26edbe09ded74b59f4f429c6e Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 28 Dec 2009 21:13:59 -0500
Subject: [PATCH] --- yaml --- r: 182287 b: refs/heads/master c:
 c7ef3a9004201bca90626db246a19dadd2c29c9b h: refs/heads/master i:   182285:
 e2bbe3d731d247b028b804c36584a2351fc6da6f   182283:
 2a43ffd40f6a6540b39ac9f67149076a385f9dc9   182279:
 3d91df77ef1f40e16802661fe1008eb21755b41b   182271:
 f85754414df4c22b85b3b5c1259241c9a270428f v: v3

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

diff --git a/[refs] b/[refs]
index 0548cb54b6fe..52c0767ceb15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a342a0280b981c130e32dbb94dbd3a57959c4d04
+refs/heads/master: c7ef3a9004201bca90626db246a19dadd2c29c9b
diff --git a/trunk/include/linux/syscalls.h b/trunk/include/linux/syscalls.h
index 207466a49f3d..ed353d274a77 100644
--- a/trunk/include/linux/syscalls.h
+++ b/trunk/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/trunk/kernel/trace/trace_syscalls.c b/trunk/kernel/trace/trace_syscalls.c
index 1352b0a36fac..a78e86349ecb 100644
--- a/trunk/kernel/trace/trace_syscalls.c
+++ b/trunk/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)