diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2014-02-24 19:59:58 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-03-07 10:06:13 -0500 |
| commit | af64a7cb09db77344c596a0bf3d57d77257e8bf5 (patch) | |
| tree | 9bfca2ea8870ed23eb49dca85303ec49752217a7 /kernel | |
| parent | c867ccd8388d1c1a31bef9c54544b2ef32f0ebca (diff) | |
| download | linux-stable-af64a7cb09db77344c596a0bf3d57d77257e8bf5.tar.gz linux-stable-af64a7cb09db77344c596a0bf3d57d77257e8bf5.tar.bz2 linux-stable-af64a7cb09db77344c596a0bf3d57d77257e8bf5.zip | |
ftrace: Pass retval through return in ftrace_dyn_arch_init()
No architecture uses the "data" parameter in ftrace_dyn_arch_init() in any
way, it just sets the value to 0. And this is used as a return value
in the caller -- ftrace_init, which just checks the retval against
zero.
Note there is also "return 0" in every ftrace_dyn_arch_init. So it is
enough to check the retval and remove all the indirect sets of data on
all archs.
Link: http://lkml.kernel.org/r/1393268401-24379-3-git-send-email-jslaby@suse.cz
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.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 76b6ed29d856..083c6d5fce25 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -4379,11 +4379,9 @@ void __init ftrace_init(void) addr = (unsigned long)ftrace_stub; local_irq_save(flags); - ftrace_dyn_arch_init(&addr); + ret = ftrace_dyn_arch_init(&addr); local_irq_restore(flags); - - /* ftrace_dyn_arch_init places the return code in addr */ - if (addr) + if (ret) goto failed; count = __stop_mcount_loc - __start_mcount_loc; |