From 0cd7c57dec77b389128a53909382be15ad58b0ef Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 10 Nov 2008 21:46:01 -0500
Subject: [PATCH] --- yaml --- r: 118763 b: refs/heads/master c:
 4143c5cb36331155a1823af8b3a8c761a59fed71 h: refs/heads/master i:   118761:
 e6e39163ae024ae4c820463285d4e148d85c22e1   118759:
 742c56a85c0bb20f84708ba246626cf4025900a0 v: v3

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

diff --git a/[refs] b/[refs]
index 440f3a64751d..62a509dce4db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf5e6519b85b3853f2d0bb4f17a4e2eaeffeb574
+refs/heads/master: 4143c5cb36331155a1823af8b3a8c761a59fed71
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
index 3f3380638646..2f76193c3489 100644
--- a/trunk/kernel/trace/ring_buffer.c
+++ b/trunk/kernel/trace/ring_buffer.c
@@ -1060,7 +1060,7 @@ rb_reserve_next_event(struct ring_buffer_per_cpu *cpu_buffer,
 
 		/* Did the write stamp get updated already? */
 		if (unlikely(ts < cpu_buffer->write_stamp))
-			goto again;
+			delta = 0;
 
 		if (test_time_stamp(delta)) {