summaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2015-01-14 12:24:37 -0500
committerSteven Rostedt <rostedt@goodmis.org>2015-01-15 09:41:11 -0500
commit83829b74f54186a154ae6b586c05cdb838c2ebc6 (patch)
tree4275f390c63316a220fd385aebd81616ba531b1b /kernel/trace
parent237d28db036e411f22c03cfd5b0f6dc2aa9bf3bc (diff)
downloadlinux-stable-83829b74f54186a154ae6b586c05cdb838c2ebc6.tar.gz
linux-stable-83829b74f54186a154ae6b586c05cdb838c2ebc6.tar.bz2
linux-stable-83829b74f54186a154ae6b586c05cdb838c2ebc6.zip
tracing: Remove extra call to init_ftrace_syscalls()
trace_init() calls init_ftrace_syscalls() and then calls trace_event_init() which also calls init_ftrace_syscalls(). It makes more sense to only call it from trace_event_init(). Calling it twice wastes memory, as it allocates the syscall events twice, and loses the first copy of it. Link: http://lkml.kernel.org/r/54AF53BD.5070303@huawei.com Link: http://lkml.kernel.org/r/20150115040505.930398632@goodmis.org Reported-by: Wang Nan <wangnan0@huawei.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/trace.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 2e767972e99c..4a9079b9f082 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -6918,7 +6918,6 @@ void __init trace_init(void)
tracepoint_printk = 0;
}
tracer_alloc_buffers();
- init_ftrace_syscalls();
trace_event_init();
}