summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2014-02-24 19:59:59 +0100
committerSteven Rostedt <rostedt@goodmis.org>2014-03-07 16:06:14 +0100
commit3a36cb11ca65cd6804972eaf1000378ba4384ea7 (patch)
tree755a42d8458d56ca3ee8e8253514eb2077dbd8f8 /arch/ia64
parentftrace: Pass retval through return in ftrace_dyn_arch_init() (diff)
downloadlinux-3a36cb11ca65cd6804972eaf1000378ba4384ea7.tar.xz
linux-3a36cb11ca65cd6804972eaf1000378ba4384ea7.zip
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 'arch/ia64')
-rw-r--r--arch/ia64/kernel/ftrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/ftrace.c b/arch/ia64/kernel/ftrace.c
index cfaa93a8bbdf..3b0c2aa07857 100644
--- a/arch/ia64/kernel/ftrace.c
+++ b/arch/ia64/kernel/ftrace.c
@@ -198,7 +198,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
}
/* run from kstop_machine */
-int __init ftrace_dyn_arch_init(void *data)
+int __init ftrace_dyn_arch_init(void)
{
return 0;
}