---

yaml --- r: 349843 b: refs/heads/master c: 771e038 h: refs/heads/master i: 349841: 77656f6 349839: 0a82a0c v: v3
git-mirror · Jan 21, 2013 · cb17c00 · cb17c00
1 parent c4a64c8
commit cb17c00
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: 418c59e49ddc77fcb7054f2c8d52c9d47403b43e
+refs/heads/master: 771e03842a9e98a1c2013ca1ed8bb2793488f3e5
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
@@ -3425,7 +3425,7 @@ static void rb_advance_iter(struct ring_buffer_iter *iter)
 	/* check for end of page padding */
 	if ((iter->head >= rb_page_size(iter->head_page)) &&
 	    (iter->head_page != cpu_buffer->commit_page))
-		rb_advance_iter(iter);
+		rb_inc_iter(iter);
 }
 
 static int rb_lost_events(struct ring_buffer_per_cpu *cpu_buffer)