From 7f9dd4c63c244301c1b3ae7f21d88c74252fa7d4 Mon Sep 17 00:00:00 2001
From: Huang Ying <ying.huang@intel.com>
Date: Wed, 28 Jul 2010 14:14:01 +0800
Subject: [PATCH] --- yaml --- r: 209613 b: refs/heads/master c:
 18fab912d4fa70133df164d2dcf3310be0c38c34 h: refs/heads/master i:   209611:
 0e0a25e2503ff48a5b085b08a48330c37189aab3 v: v3

---
 [refs]                           | 2 +-
 trunk/kernel/trace/ring_buffer.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e740f729e0d3..589df9020b70 100644
--- 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
index 1da7b6ea8b85..5ec8f1d1480e 100644
--- 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);