summaryrefslogtreecommitdiffstats
path: root/arch/sh
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 10:06:14 -0500
commit3a36cb11ca65cd6804972eaf1000378ba4384ea7 (patch)
tree755a42d8458d56ca3ee8e8253514eb2077dbd8f8 /arch/sh
parentaf64a7cb09db77344c596a0bf3d57d77257e8bf5 (diff)
downloadblackbird-op-linux-3a36cb11ca65cd6804972eaf1000378ba4384ea7.tar.gz
blackbird-op-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/sh')
-rw-r--r--arch/sh/kernel/ftrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/ftrace.c b/arch/sh/kernel/ftrace.c
index 493997541d2c..3c74f53db6db 100644
--- a/arch/sh/kernel/ftrace.c
+++ b/arch/sh/kernel/ftrace.c
@@ -272,7 +272,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
return ftrace_modify_code(rec->ip, old, new);
}
-int __init ftrace_dyn_arch_init(void *data)
+int __init ftrace_dyn_arch_init(void)
{
return 0;
}
OpenPOWER on IntegriCloud