summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMatt Fleming <matt@console-pimps.org>2009-07-23 17:16:14 +0100
committerSteven Rostedt <rostedt@goodmis.org>2009-07-23 12:20:08 -0400
commitfc4c73554c9d93b3e495f2f7acae1323b0d5db84 (patch)
treea9635397f1c489a77ac398567c42a01e0c3bd06b /scripts
parent8650ae32ef7045e763825dee6256dde7f331bb85 (diff)
downloadlinux-stable-fc4c73554c9d93b3e495f2f7acae1323b0d5db84.tar.gz
linux-stable-fc4c73554c9d93b3e495f2f7acae1323b0d5db84.tar.bz2
linux-stable-fc4c73554c9d93b3e495f2f7acae1323b0d5db84.zip
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@console-pimps.org> LKML-Reference: <1248365775-25196-1-git-send-email-matt@console-pimps.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/recordmcount.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 7109e2b5bc0a..16c5563b4129 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;
}
}