Merge branch 'tracing/ftrace' into auto-ftrace-next

1 files changed, 2 insertions, 1 deletions

diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c
index bf7e91caef57..3c8d61df4474 100644
--- a/kernel/trace/trace_sched_wakeup.c
+++ b/kernel/trace/trace_sched_wakeup.c
@@ -352,9 +352,10 @@ static void start_wakeup_tracer(struct trace_array *tr)
          */
         smp_wmb();
 
-        tracer_enabled = 1;
         register_ftrace_function(&trace_ops);
 
+        tracer_enabled = 1;
+
         return;
 fail_deprobe_wake_new:
         marker_probe_unregister("kernel_sched_wakeup_new",