diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2013-03-26 17:53:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-12 09:18:09 -0700 |
| commit | d510800edaf1e0e48f8778114682a1586fc9aaa9 (patch) | |
| tree | 16d3936378e27f10a33cab0c1a9b2d050f709117 /kernel | |
| parent | 48631b65db235d68acbde42a1cb6804afbfd283e (diff) | |
| download | kernel_samsung_aries-d510800edaf1e0e48f8778114682a1586fc9aaa9.zip kernel_samsung_aries-d510800edaf1e0e48f8778114682a1586fc9aaa9.tar.gz kernel_samsung_aries-d510800edaf1e0e48f8778114682a1586fc9aaa9.tar.bz2 | |
ftrace: Consistently restore trace function on sysctl enabling
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/ftrace.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index b2ca34a..63ce76f 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -3934,12 +3934,8 @@ ftrace_enable_sysctl(struct ctl_table *table, int write, 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) */ |