ftrace: Only disable ftrace_enabled to test buffer in selftest

[sfrench/cifs-2.6.git] / kernel / trace / trace_selftest.c

diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index 5ef60499dc8e6c6df909794c1a54eed4b9bb2dbf..61a6acd6025d9ec9f32cbea4f11b74500744001f 100644 (file)
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -382,6 +382,8 @@ static int trace_selftest_startup_dynamic_tracing(struct tracer *trace,
 
        /* check the trace buffer */
        ret = trace_test_buffer(&tr->trace_buffer, &count);
+
+       ftrace_enabled = 1;
        tracing_start();
 
        /* we should only have one item */
@@ -679,6 +681,8 @@ trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr)
 
        /* check the trace buffer */
        ret = trace_test_buffer(&tr->trace_buffer, &count);
+
+       ftrace_enabled = 1;
        trace->reset(tr);
        tracing_start();