---

yaml --- r: 361558 b: refs/heads/master c: 8090282 h: refs/heads/master v: v3
git-mirror · Mar 15, 2013 · 3f2af95 · 3f2af95
1 parent 22b8e65
commit 3f2af95
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69d34da2984c95b33ea21518227e1f9470f11d95
+refs/heads/master: 80902822658aab18330569587cdb69ac1dfdcea8
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
@@ -2895,8 +2895,12 @@ static void set_tracer_flags(unsigned int mask, int enabled)
 	if (mask == TRACE_ITER_RECORD_CMD)
 		trace_event_enable_cmd_record(enabled);
 
-	if (mask == TRACE_ITER_OVERWRITE)
+	if (mask == TRACE_ITER_OVERWRITE) {
 		ring_buffer_change_overwrite(global_trace.buffer, enabled);
+#ifdef CONFIG_TRACER_MAX_TRACE
+		ring_buffer_change_overwrite(max_tr.buffer, enabled);
+#endif
+	}
 
 	if (mask == TRACE_ITER_PRINTK)
 		trace_printk_start_stop_comm(enabled);