ftrace: Fix ftrace enable ordering of sysctl ftrace_enabled

[linux-drm-fsl-dcu.git] / kernel / trace / ftrace.c

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index ea520bb54d44acb1b83bd6b707a470f1256e0dfe..4f228024055b119d93279705ec4c42d7475c72f7 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2710,7 +2710,7 @@ static void ftrace_startup_sysctl(void)
                command = FTRACE_UPDATE_CALLS;
                if (ftrace_graph_active)
                        command |= FTRACE_START_FUNC_RET;
-               ftrace_run_update_code(command);
+               ftrace_startup_enable(command);
        }
 }
 
@@ -5580,12 +5580,12 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
 
        if (ftrace_enabled) {
 
-               ftrace_startup_sysctl();
-
                /* we are starting ftrace again */
                if (ftrace_ops_list != &ftrace_list_end)
                        update_ftrace_function();
 
+               ftrace_startup_sysctl();
+
        } else {
                /* stopping ftrace calls (just send to ftrace_stub) */
                ftrace_trace_function = ftrace_stub;