hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ftrace: Only update $offset when we update $ref_func 

The value of $offset should be the offset of $ref_func from the
beginning of the object file. Therefore, we should set both variables
together.

This fixes a bug I was hitting on sh where $offset (which is used to
calcualte the addends for the __mcount_loc entries) was being set
multiple times and didn't correspond to $ref_func's offset in the object
file. The addends in __mcount_loc were calculated incorrectly, resulting
in ftrace dynamically modifying addresses that weren't mcount call
sites.

Signed-off-by: Matt Fleming <matt@console-pimps.org>
LKML-Reference: <1248365775-25196-2-git-send-email-matt@console-pimps.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Matt Fleming 2009-07-23 17:16:15 +01:00 committed by Steven Rostedt
parent fc4c73554c
commit bd171d5ffc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/recordmcount.pl
View File

@ -403,7 +403,6 @@ while (<IN>) {
# section found, now is this a start of a function? # section found, now is this a start of a function?
} elsif ($read_function && /$function_regex/) { } elsif ($read_function && /$function_regex/) {
$text_found = 1; $text_found = 1;
$offset = hex $1;
$text = $2; $text = $2;
# if this is either a local function or a weak function # if this is either a local function or a weak function
@ -412,10 +411,12 @@ while (<IN>) {
if (!defined($locals{$text}) && !defined($weak{$text})) { if (!defined($locals{$text}) && !defined($weak{$text})) {
$ref_func = $text; $ref_func = $text;
$read_function = 0; $read_function = 0;
$offset = hex $1;
} else { } else {
# if we already have a function, and this is weak, skip it # 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; $ref_func = $text;
$offset = hex $1;
} }
} }
} elsif ($read_headers && /$mcount_section/) { } elsif ($read_headers && /$mcount_section/) {