adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

ftrace, ia64: explictly ignore a file in recordmcount.pl

Browse source 
In IA64, a function pointer isn't a 'unsigned long' but a
'struct {unsigned long ip, unsigned long gp}'. MCOUNT_ADDR is determined
at link time not compile time, so explictly ignore kernel/trace/ftrace.o
in recordmcount.pl.

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Shaohua Li 2009-01-09 11:29:40 +08:00 committed by Ingo Molnar
parent 18c167fd6d
commit 25aac9dc7c
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kernel/trace/ftrace.c
View file

@ -263,14 +263,6 @@ static void ftrace_update_pid_func(void)
# error Dynamic ftrace depends on MCOUNT_RECORD # error Dynamic ftrace depends on MCOUNT_RECORD
#endif #endif
/*
* Since MCOUNT_ADDR may point to mcount itself, we do not want
* to get it confused by reading a reference in the code as we
* are parsing on objcopy output of text. Use a variable for
* it instead.
*/
static unsigned long mcount_addr = MCOUNT_ADDR;
enum { enum {
FTRACE_ENABLE_CALLS = (1 << 0), FTRACE_ENABLE_CALLS = (1 << 0),
FTRACE_DISABLE_CALLS = (1 << 1), FTRACE_DISABLE_CALLS = (1 << 1),
@ -575,7 +567,7 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
ip = rec->ip; ip = rec->ip;
ret = ftrace_make_nop(mod, rec, mcount_addr); ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
if (ret) { if (ret) {
ftrace_bug(ret, ip); ftrace_bug(ret, ip);
rec->flags |= FTRACE_FL_FAILED; rec->flags |= FTRACE_FL_FAILED;

5
scripts/recordmcount.pl
View file

@ -109,6 +109,11 @@ if ($#ARGV < 7) {
my ($arch, $bits, $objdump, $objcopy, $cc, my ($arch, $bits, $objdump, $objcopy, $cc,
$ld, $nm, $rm, $mv, $is_module, $inputfile) = @ARGV; $ld, $nm, $rm, $mv, $is_module, $inputfile) = @ARGV;
# This file refers to mcount and shouldn't be ftraced, so lets' ignore it
if ($inputfile eq "kernel/trace/ftrace.o") {
exit(0);
}
# Acceptable sections to record. # Acceptable sections to record.
my %text_sections = ( my %text_sections = (
".text" => 1, ".text" => 1,