lkml.org 
[lkml]   [2012]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC][PATCH 11/13 v2] ftrace: Make ftrace_location() a nop on !DYNAMIC_FTRACE
    From: Steven Rostedt <srostedt@redhat.com>

    When CONFIG_DYNAMIC_FTRACE is not set, ftrace_location() is not defined.
    If a user (like kprobes) references this function, it will break
    the compile when CONFIG_DYNAMIC_FTRACE is not set.

    Add ftrace_location() as a nop (return 0) when DYNAMIC_FTRACE
    is not defined.

    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    include/linux/ftrace.h | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
    index 34ac110..271d006 100644
    --- a/include/linux/ftrace.h
    +++ b/include/linux/ftrace.h
    @@ -500,7 +500,7 @@ extern int skip_trace(unsigned long ip);

    extern void ftrace_disable_daemon(void);
    extern void ftrace_enable_daemon(void);
    -#else
    +#else /* CONFIG_DYNAMIC_FTRACE */
    static inline int skip_trace(unsigned long ip) { return 0; }
    static inline int ftrace_force_update(void) { return 0; }
    static inline void ftrace_disable_daemon(void) { }
    @@ -518,6 +518,10 @@ static inline int ftrace_text_reserved(void *start, void *end)
    {
    return 0;
    }
    +static inline unsigned long ftrace_location(unsigned long ip)
    +{
    + return 0;
    +}

    /*
    * Again users of functions that have ftrace_ops may not
    --
    1.7.10



    \
     
     \ /
      Last update: 2012-06-13 02:41    [W:0.119 / U:0.028 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site