Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / kernel / trace / trace_sched_wakeup.c

diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c
index bf7e91caef57d0ae6496688e82530598eab09421..3c8d61df4474adc473b107f04df43028f8efbee6 100644 (file)
--- 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",