Merge remote-tracking branch 'ftrace/for-next'

[karo-tx-linux.git] / kernel / trace / trace_benchmark.c

diff --git a/kernel/trace/trace_benchmark.c b/kernel/trace/trace_benchmark.c
index 40a14cbcf8e01b5d2c32663fa3666c91be582f67..0f109c4130d300384cc5e1a22d4fbbb98ed1539f 100644 (file)
--- a/kernel/trace/trace_benchmark.c
+++ b/kernel/trace/trace_benchmark.c
@@ -43,7 +43,7 @@ static void trace_do_benchmark(void)
        unsigned int std = 0;
 
        /* Only run if the tracepoint is actually active */
-       if (!trace_benchmark_event_enabled())
+       if (!trace_benchmark_event_enabled() || !tracing_is_on())
                return;
 
        local_irq_disable();