Messages in this thread Patch in this message | | | Date | Wed, 20 Jun 2012 03:38:32 -0700 | From | tip-bot for Borislav Petkov <> | Subject | [tip:perf/core] ftrace: Remove a superfluous check |
| |
Commit-ID: 8d240dd88cca33b704adf3fe281aa64b5aac2dd8 Gitweb: http://git.kernel.org/tip/8d240dd88cca33b704adf3fe281aa64b5aac2dd8 Author: Borislav Petkov <bp@amd64.org> AuthorDate: Thu, 29 Mar 2012 19:11:40 +0200 Committer: Steven Rostedt <rostedt@goodmis.org> CommitDate: Thu, 14 Jun 2012 15:22:12 -0400
ftrace: Remove a superfluous check
register_ftrace_function() checks ftrace_disabled and calls __register_ftrace_function which does it again.
Drop the first check and add the unlikely hint to the second one. Also, drop the label as John correctly notices.
No functional change.
Link: http://lkml.kernel.org/r/20120329171140.GE6409@aftab
Cc: Borislav Petkov <bp@amd64.org> Cc: John Kacur <jkacur@redhat.com> Signed-off-by: Borislav Petkov <borislav.petkov@amd.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> --- kernel/trace/ftrace.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index a008663..b4f20fb 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -312,7 +312,7 @@ static int remove_ftrace_list_ops(struct ftrace_ops **list, static int __register_ftrace_function(struct ftrace_ops *ops) { - if (ftrace_disabled) + if (unlikely(ftrace_disabled)) return -ENODEV; if (FTRACE_WARN_ON(ops == &global_ops)) @@ -4299,16 +4299,12 @@ int register_ftrace_function(struct ftrace_ops *ops) mutex_lock(&ftrace_lock); - if (unlikely(ftrace_disabled)) - goto out_unlock; - ret = __register_ftrace_function(ops); if (!ret) ret = ftrace_startup(ops, 0); - - out_unlock: mutex_unlock(&ftrace_lock); + return ret; } EXPORT_SYMBOL_GPL(register_ftrace_function);
| |