summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Hong <lihong.hi@gmail.com>2009-10-28 06:07:03 +0100
committerSteven Rostedt <rostedt@goodmis.org>2009-10-29 20:11:54 +0100
commit6092858c60f168c1950f8ad73880d54271696ec5 (patch)
tree4a77f87c47959f8fbfe2fdb99532575e227b0663
parenttracing: Add regex for weak functions in recordmcount.pl (diff)
downloadlinux-6092858c60f168c1950f8ad73880d54271696ec5.tar.xz
linux-6092858c60f168c1950f8ad73880d54271696ec5.zip
tracing: Move conditional into update_funcs() in recordmcount.pl
Move all the condition validations into the function update_funcs(). Also update_funcs should not die if $ref_func is undefined for there may be more than one valid section in an object file. Signed-off-by: Li Hong <lihong.hi@gmail.com> LKML-Reference: <20091028050703.GG30758@uhli> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rwxr-xr-xscripts/recordmcount.pl8
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 7265a7dcac4b..884776a6e01a 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -348,9 +348,7 @@ my $offset = 0; # offset of ref_func to section beginning
#
sub update_funcs
{
- return if ($#offsets < 0);
-
- defined($ref_func) || die "No function to reference";
+ return unless ($ref_func and @offsets);
# A section only had a weak function, to represent it.
# Unfortunately, a weak function may be overwritten by another
@@ -425,7 +423,7 @@ while (<IN>) {
$read_function = 0;
}
# print out any recorded offsets
- update_funcs() if (defined($ref_func));
+ update_funcs();
# reset all markers and arrays
$text_found = 0;
@@ -462,7 +460,7 @@ while (<IN>) {
}
# dump out anymore offsets that may have been found
-update_funcs() if (defined($ref_func));
+update_funcs();
# If we did not find any mcount callers, we are done (do nothing).
if (!$opened) {