From cb17c00d4c75a9b0f8ad5134b02d22c9a7edb95a Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Fri, 30 Nov 2012 10:41:57 -0500 Subject: [PATCH] --- yaml --- r: 349843 b: refs/heads/master c: 771e03842a9e98a1c2013ca1ed8bb2793488f3e5 h: refs/heads/master i: 349841: 77656f6d879d1ef1f606483d124f75e0df54035b 349839: 0a82a0cc0798d7a182a9d8b6d47dda60922e0ebe 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 0c5ead556183..811752ef9cb7 100644 --- 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 index ce8514feedcd..6ff9cc4658ed 100644 --- 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)