---

yaml --- r: 318015 b: refs/heads/master c: b2ad368 h: refs/heads/master i: 318013: 650c21d 318011: 322e7b8 318007: 112ef5d 317999: 3f5c0fd 317983: bbba5e2 317951: 9b00abd v: v3
git-mirror · Jul 17, 2012 · 811d1be · 811d1be
1 parent e138313
commit 811d1be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1743cbc8d20d208bb1d2b10598204f2d89b144c
+refs/heads/master: b2ad368bebc0f772613668e893fa176396e9094c
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
@@ -3172,10 +3172,10 @@ static int tracing_set_tracer(const char *buf)
 	}
 	destroy_trace_option_files(topts);
 
-	current_trace = t;
+	current_trace = &nop_trace;
 
-	topts = create_trace_option_files(current_trace);
-	if (current_trace->use_max_tr) {
+	topts = create_trace_option_files(t);
+	if (t->use_max_tr) {
 		int cpu;
 		/* we need to make per cpu buffer sizes equivalent */
 		for_each_tracing_cpu(cpu) {
@@ -3195,6 +3195,7 @@ static int tracing_set_tracer(const char *buf)
 			goto out;
 	}
 
+	current_trace = t;
 	trace_branch_enable(tr);
  out:
 	mutex_unlock(&trace_types_lock);