---

yaml --- r: 209613 b: refs/heads/master c: 18fab91 h: refs/heads/master i: 209611: 0e0a25e v: v3
git-mirror · Aug 6, 2010 · 7f9dd4c · 7f9dd4c
1 parent 43534f5
commit 7f9dd4c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 575570f02761bd680ba5731c1dfd4701062e7fb2
+refs/heads/master: 18fab912d4fa70133df164d2dcf3310be0c38c34
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
@@ -3868,6 +3868,9 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
 			rpos = reader->read;
 			pos += size;
 
+			if (rpos >= commit)
+				break;
+
 			event = rb_reader_event(cpu_buffer);
 			size = rb_event_length(event);
 		} while (len > size);