lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into tracing/core

Browse Source 
Conflicts:
	kernel/trace/trace_events_filter.c

We use the tracing/core version.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-08-11 14:19:09 +02:00
parent fb82ad7198 85dfd81dc5
commit 89034bc2c7
1029 changed files with 32122 additions and 16291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/recordmcount.pl
View File

@@ -392,7 +392,7 @@ while (<IN>) {
$read_function = 0;
}
# print out any recorded offsets
update_funcs() if ($text_found);
update_funcs() if (defined($ref_func));
# reset all markers and arrays
$text_found = 0;
@@ -402,7 +402,6 @@ while (<IN>) {
# section found, now is this a start of a function?
} elsif ($read_function && /$function_regex/) {
$text_found = 1;
$offset = hex $1;
$text = $2;
# if this is either a local function or a weak function
@@ -411,10 +410,15 @@ while (<IN>) {
if (!defined($locals{$text}) && !defined($weak{$text})) {
$ref_func = $text;
$read_function = 0;
$offset = hex $1;
} 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}) &&
# PPC64 can have symbols that start with .L and
# gcc considers these special. Don't use them!
$text !~ /^\.L/) {
$ref_func = $text;
$offset = hex $1;
}
}
} elsif ($read_headers && /$mcount_section/) {
@@ -439,7 +443,7 @@ while (<IN>) {
}
# dump out anymore offsets that may have been found
update_funcs() if ($text_found);
update_funcs() if (defined($ref_func));
# If we did not find any mcount callers, we are done (do nothing).
if (!$opened) {