diff options
author | Li Hong <lihong.hi@gmail.com> | 2009-10-28 01:07:03 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2009-10-29 15:11:54 -0400 |
commit | 6092858c60f168c1950f8ad73880d54271696ec5 (patch) | |
tree | 4a77f87c47959f8fbfe2fdb99532575e227b0663 | |
parent | 306dcf47d28aaf9aedfafb17a602768584cfc0f2 (diff) |
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-x | scripts/recordmcount.pl | 8 |
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 | |||
348 | # | 348 | # |
349 | sub update_funcs | 349 | sub update_funcs |
350 | { | 350 | { |
351 | return if ($#offsets < 0); | 351 | return unless ($ref_func and @offsets); |
352 | |||
353 | defined($ref_func) || die "No function to reference"; | ||
354 | 352 | ||
355 | # A section only had a weak function, to represent it. | 353 | # A section only had a weak function, to represent it. |
356 | # Unfortunately, a weak function may be overwritten by another | 354 | # Unfortunately, a weak function may be overwritten by another |
@@ -425,7 +423,7 @@ while (<IN>) { | |||
425 | $read_function = 0; | 423 | $read_function = 0; |
426 | } | 424 | } |
427 | # print out any recorded offsets | 425 | # print out any recorded offsets |
428 | update_funcs() if (defined($ref_func)); | 426 | update_funcs(); |
429 | 427 | ||
430 | # reset all markers and arrays | 428 | # reset all markers and arrays |
431 | $text_found = 0; | 429 | $text_found = 0; |
@@ -462,7 +460,7 @@ while (<IN>) { | |||
462 | } | 460 | } |
463 | 461 | ||
464 | # dump out anymore offsets that may have been found | 462 | # dump out anymore offsets that may have been found |
465 | update_funcs() if (defined($ref_func)); | 463 | update_funcs(); |
466 | 464 | ||
467 | # If we did not find any mcount callers, we are done (do nothing). | 465 | # If we did not find any mcount callers, we are done (do nothing). |
468 | if (!$opened) { | 466 | if (!$opened) { |