From: Borislav Petkov <bp@amd64.org>
Date: Thu, 29 Mar 2012 17:11:40 +0000 (+0200)
Subject: ftrace: Remove a superfluous check
X-Git-Tag: v3.6-rc1~167^2~40^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d240dd88cca33b704adf3fe281aa64b5aac2dd8;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed