Commit-ID: fc4c73554c9d93b3e495f2f7acae1323b0d5db84 Gitweb: http://git.kernel.org/tip/fc4c73554c9d93b3e495f2f7acae1323b0d5db84 Author: Matt Fleming <matt@xxxxxxxxxxxxxxxxx> AuthorDate: Thu, 23 Jul 2009 17:16:14 +0100 Committer: Steven Rostedt <rostedt@xxxxxxxxxxx> CommitDate: Thu, 23 Jul 2009 12:20:08 -0400 ftrace: Fix the conditional that updates $ref_func Fix the conditional that checks if we already have a $ref_func and that the new function is weak. The code as previously checking whether either condition was false, and we really need to only update $ref_func is both cconditions are false. Signed-off-by: Matt Fleming <matt@xxxxxxxxxxxxxxxxx> LKML-Reference: <1248365775-25196-1-git-send-email-matt@xxxxxxxxxxxxxxxxx> Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx> --- scripts/recordmcount.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index 7109e2b..16c5563 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl @@ -414,7 +414,7 @@ while (<IN>) { $read_function = 0; } else { # if we already have a function, and this is weak, skip it - if (!defined($ref_func) || !defined($weak{$text})) { + if (!defined($ref_func) && !defined($weak{$text})) { $ref_func = $text; } } -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html