lkml.org 
[lkml]   [2012]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 04/19] ftrace/x86_32: Push ftrace_ops in as 3rd parameter to function tracer
    From: Steven Rostedt <srostedt@redhat.com>

    Add support of passing the current ftrace_ops into the 3rd parameter
    of the callback to the function tracer.

    Link: http://lkml.kernel.org/r/20120612225424.942411318@goodmis.org

    Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    arch/x86/include/asm/ftrace.h | 2 +-
    arch/x86/kernel/entry_32.S | 1 +
    2 files changed, 2 insertions(+), 1 deletion(-)

    diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h
    index 783b107..b3bb1f3 100644
    --- a/arch/x86/include/asm/ftrace.h
    +++ b/arch/x86/include/asm/ftrace.h
    @@ -32,7 +32,7 @@
    #define MCOUNT_ADDR ((long)(mcount))
    #define MCOUNT_INSN_SIZE 5 /* sizeof mcount call */

    -#if defined(CONFIG_DYNAMIC_FTRACE) && defined(CONFIG_X86_64)
    +#ifdef CONFIG_DYNAMIC_FTRACE
    #define ARCH_SUPPORTS_FTRACE_OPS 1
    #endif

    diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
    index 623f288..e3e17a0 100644
    --- a/arch/x86/kernel/entry_32.S
    +++ b/arch/x86/kernel/entry_32.S
    @@ -1111,6 +1111,7 @@ ENTRY(ftrace_caller)
    pushl %edx
    movl 0xc(%esp), %eax
    movl 0x4(%ebp), %edx
    + leal function_trace_op, %ecx
    subl $MCOUNT_INSN_SIZE, %eax

    .globl ftrace_call
    --
    1.7.10.4

    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-07-21 05:01    [W:2.577 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site