From 392cbef363aa1aec7f587bc8dc224be284017c72 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Wed, 6 May 2009 12:40:51 -0400
Subject: [PATCH] --- yaml --- r: 146101 b: refs/heads/master c:
 00c81a58c5b4e0de14ee33bfbc3d71c90f69f9ea h: refs/heads/master i:   146099:
 44e7519451914b37175622b2bbfed723ad47511d v: v3

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

diff --git a/[refs] b/[refs]
index 74cbdad4fd3b..f2413dc6fbf5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e7abf1c62941ebb7a1416cbc62392c8a0902625
+refs/heads/master: 00c81a58c5b4e0de14ee33bfbc3d71c90f69f9ea
diff --git a/trunk/kernel/trace/ring_buffer_benchmark.c b/trunk/kernel/trace/ring_buffer_benchmark.c
index 747244acb8fd..dcd75e9e49f4 100644
--- a/trunk/kernel/trace/ring_buffer_benchmark.c
+++ b/trunk/kernel/trace/ring_buffer_benchmark.c
@@ -84,6 +84,9 @@ static enum event_status read_page(int cpu)
 	int i;
 
 	bpage = ring_buffer_alloc_read_page(buffer);
+	if (!bpage)
+		return EVENT_DROPPED;
+
 	ret = ring_buffer_read_page(buffer, &bpage, PAGE_SIZE, cpu, 1);
 	if (ret >= 0) {
 		rpage = bpage;