summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-12-29 02:13:59 (GMT)
committerSteven Rostedt <rostedt@goodmis.org>2010-01-06 17:02:32 (GMT)
commitc7ef3a9004201bca90626db246a19dadd2c29c9b (patch)
treeae6ffbf65a5e75f4cfcded814ea28eb1d35b025c
parenta342a0280b981c130e32dbb94dbd3a57959c4d04 (diff)
downloadlinux-fsl-qoriq-c7ef3a9004201bca90626db246a19dadd2c29c9b.tar.xz
tracing: Have syscall tracing call its own init function
In the clean up of having all events call one specific function, the syscall event init was changed to call this helper function. With the new print_fmt updates, the syscalls need to do special initializations. This patch converts the syscall events to call its own init function again. Cc: Lai Jiangshan <laijs@cn.fujitsu.com> Cc: Li Zefan <lizf@cn.fujitsu.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--include/linux/syscalls.h4
-rw-r--r--kernel/trace/trace_syscalls.c12
2 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 207466a..ed353d2 100644
--- a/include/linux/syscalls.h
+++ b/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/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 1352b0a..a78e863 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/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)