---

yaml --- r: 118763 b: refs/heads/master c: 4143c5c h: refs/heads/master i: 118761: e6e3916 118759: 742c56a v: v3
git-mirror · Nov 11, 2008 · 0cd7c57 · 0cd7c57
1 parent 19f0e7b
commit 0cd7c57
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)) {