---

yaml --- r: 349847 b: refs/heads/master c: a541641 h: refs/heads/master i: 349845: 5f110c0 349843: cb17c00 349839: 0a82a0c v: v3
git-mirror · Jan 21, 2013 · 8459346 · 8459346
1 parent 9cb1b38
commit 8459346
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6aea49cb5f3001a8275bf9c9f586ec3eb39af194
+refs/heads/master: a54164114b96b4693b42cdb553260eec41ea4393
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
@@ -922,6 +922,9 @@ void tracing_reset(struct trace_array *tr, int cpu)
 {
 	struct ring_buffer *buffer = tr->buffer;
 
+	if (!buffer)
+		return;
+
 	ring_buffer_record_disable(buffer);
 
 	/* Make sure all commits have finished */
@@ -936,6 +939,9 @@ void tracing_reset_online_cpus(struct trace_array *tr)
 	struct ring_buffer *buffer = tr->buffer;
 	int cpu;
 
+	if (!buffer)
+		return;
+
 	ring_buffer_record_disable(buffer);
 
 	/* Make sure all commits have finished */