aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2014-02-24 13:59:59 -0500
committerSteven Rostedt <rostedt@goodmis.org>2014-03-07 10:06:14 -0500
commit3a36cb11ca65cd6804972eaf1000378ba4384ea7 (patch)
tree755a42d8458d56ca3ee8e8253514eb2077dbd8f8 /kernel
parentaf64a7cb09db77344c596a0bf3d57d77257e8bf5 (diff)
ftrace: Do not pass data to ftrace_dyn_arch_init
As the data parameter is not really used by any ftrace_dyn_arch_init, remove that from ftrace_dyn_arch_init. This also removes the addr local variable from ftrace_init which is now unused. Note the documentation was imprecise as it did not suggest to set (*data) to 0. Link: http://lkml.kernel.org/r/1393268401-24379-4-git-send-email-jslaby@suse.cz Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: linux-arch@vger.kernel.org Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/ftrace.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 083c6d5fce25..5bd70e8b09b0 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -4372,14 +4372,11 @@ void __init ftrace_init(void)
4372{ 4372{
4373 extern unsigned long __start_mcount_loc[]; 4373 extern unsigned long __start_mcount_loc[];
4374 extern unsigned long __stop_mcount_loc[]; 4374 extern unsigned long __stop_mcount_loc[];
4375 unsigned long count, addr, flags; 4375 unsigned long count, flags;
4376 int ret; 4376 int ret;
4377 4377
4378 /* Keep the ftrace pointer to the stub */
4379 addr = (unsigned long)ftrace_stub;
4380
4381 local_irq_save(flags); 4378 local_irq_save(flags);
4382 ret = ftrace_dyn_arch_init(&addr); 4379 ret = ftrace_dyn_arch_init();
4383 local_irq_restore(flags); 4380 local_irq_restore(flags);
4384 if (ret) 4381 if (ret)
4385 goto failed; 4382 goto failed;