Commit 5000c418 authored by Jan Kiszka's avatar Jan Kiszka Committed by Steven Rostedt

ftrace: Consistently restore trace function on sysctl enabling

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

Cc: stable@vger.kernel.org
Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 2930e04d
...@@ -4555,12 +4555,8 @@ ftrace_enable_sysctl(struct ctl_table *table, int write, ...@@ -4555,12 +4555,8 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
ftrace_startup_sysctl(); ftrace_startup_sysctl();
/* we are starting ftrace again */ /* we are starting ftrace again */
if (ftrace_ops_list != &ftrace_list_end) { if (ftrace_ops_list != &ftrace_list_end)
if (ftrace_ops_list->next == &ftrace_list_end) update_ftrace_function();
ftrace_trace_function = ftrace_ops_list->func;
else
ftrace_trace_function = ftrace_ops_list_func;
}
} else { } else {
/* stopping ftrace calls (just send to ftrace_stub) */ /* stopping ftrace calls (just send to ftrace_stub) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment