lkml.org 
[lkml]   [2009]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/9] ftrace, ia64: explictly ignore a file in recordmcount.pl
    From: Shaohua Li <shaohua.li@intel.com>

    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>
    ---
    kernel/trace/ftrace.c | 10 +---------
    scripts/recordmcount.pl | 5 +++++
    2 files changed, 6 insertions(+), 9 deletions(-)

    diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
    index 9e54a6c..76bb884 100644
    --- a/kernel/trace/ftrace.c
    +++ b/kernel/trace/ftrace.c
    @@ -263,14 +263,6 @@ static void ftrace_update_pid_func(void)
    # error Dynamic ftrace depends on MCOUNT_RECORD
    #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 {
    FTRACE_ENABLE_CALLS = (1 << 0),
    FTRACE_DISABLE_CALLS = (1 << 1),
    @@ -575,7 +567,7 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)

    ip = rec->ip;

    - ret = ftrace_make_nop(mod, rec, mcount_addr);
    + ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
    if (ret) {
    ftrace_bug(ret, ip);
    rec->flags |= FTRACE_FL_FAILED;
    diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
    index 282485a..070042b 100755
    --- a/scripts/recordmcount.pl
    +++ b/scripts/recordmcount.pl
    @@ -109,6 +109,11 @@ if ($#ARGV < 7) {
    my ($arch, $bits, $objdump, $objcopy, $cc,
    $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.
    my %text_sections = (
    ".text" => 1,
    --
    1.5.6.5
    --


    \
     
     \ /
      Last update: 2009-01-13 07:15    [W:0.035 / U:0.344 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site