X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=kernel%2Ftrace%2Ftrace_selftest.c;h=b0f86ea77881ecf3c6fbb626f298df3d25c57a48;hp=593f52b73551c2406b244e2dd772eba6d6d247b3;hb=8df6be116c87314e35c2ac9de35561b57f87739f;hpb=addff1feb02b03cb766b9a611c6b2cebf29bc285

diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index 593f52b73551..b0f86ea77881 100644
--- 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();