---

yaml --- r: 141003 b: refs/heads/master c: 0cf53ff h: refs/heads/master i: 141001: 70d487b 140999: 198a9bb v: v3
git-mirror · Mar 22, 2009 · b6a1e74 · b6a1e74
1 parent 19035ae
commit b6a1e74
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf586b61f80229491127d3c57c06ed93c9f530d3
+refs/heads/master: 0cf53ff62b3e9e491ff5e5f05b193fb6ce643047
diff --git a/trunk/kernel/trace/trace_selftest.c b/trunk/kernel/trace/trace_selftest.c
@@ -299,7 +299,7 @@ trace_selftest_startup_function_graph(struct tracer *trace,
 
 	/* Have we just recovered from a hang? */
 	if (graph_hang_thresh > GRAPH_MAX_FUNC_TEST) {
-		trace->reset(tr);
+		tracing_selftest_disabled = true;
 		ret = -1;
 		goto out;
 	}