---

yaml --- r: 146049 b: refs/heads/master c: 3554228 h: refs/heads/master i: 146047: f3b31ea v: v3
git-mirror · Apr 21, 2009 · 8c12d6f · 8c12d6f
1 parent 6290245
commit 8c12d6f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f66578a7637b87810cbb9041c4e3a77fd2fa4706
+refs/heads/master: 3554228d4289098a8fe5cfd87512ec32a19bbe5a
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
@@ -1241,7 +1241,8 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
 		 * about it.
 		 */
 		if (unlikely(next_page == commit_page)) {
-			WARN_ON_ONCE(1);
+			/* This can easily happen on small ring buffers */
+			WARN_ON_ONCE(buffer->pages > 2);
 			goto out_reset;
 		}