lkml.org 
[lkml]   [2013]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 10/19] ftrace: Consistently restore trace function on sysctl enabling
    Date
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jan Kiszka <jan.kiszka@siemens.com>

    commit 5000c418840b309251c5887f0b56503aae30f84c upstream.

    If we reenable ftrace via syctl, we currently set ftrace_trace_function
    based on the previous simplistic algorithm. This is inconsistent with
    what update_ftrace_function does. So better call that helper instead.

    Link: http://lkml.kernel.org/r/5151D26F.1070702@siemens.com

    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    kernel/trace/ftrace.c | 8 ++------
    1 file changed, 2 insertions(+), 6 deletions(-)

    --- a/kernel/trace/ftrace.c
    +++ b/kernel/trace/ftrace.c
    @@ -3934,12 +3934,8 @@ ftrace_enable_sysctl(struct ctl_table *t
    ftrace_startup_sysctl();

    /* we are starting ftrace again */
    - if (ftrace_ops_list != &ftrace_list_end) {
    - if (ftrace_ops_list->next == &ftrace_list_end)
    - ftrace_trace_function = ftrace_ops_list->func;
    - else
    - ftrace_trace_function = ftrace_ops_list_func;
    - }
    + if (ftrace_ops_list != &ftrace_list_end)
    + update_ftrace_function();

    } else {
    /* stopping ftrace calls (just send to ftrace_stub) */



    \
     
     \ /
      Last update: 2013-04-11 03:01    [W:4.568 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site