From: Steven Rostedt (Red Hat) <rostedt@goodmis.org>
Date: Wed, 23 Jul 2014 23:45:12 +0000 (-0400)
Subject: ring-buffer: Use rb_page_size() instead of open coded head_page size
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=10e83fd01ccbb7122ad2c9dce68fb01bebb3fc46;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

ring-buffer: Use rb_page_size() instead of open coded head_page size

There's a helper function to get a ring buffer page size (the number
of bytes of data recorded on the page), called rb_page_size().
Use that instead of open coding it.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 35825a87d6a3..d8c267ec5cca 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -3763,7 +3763,7 @@ rb_iter_peek(struct ring_buffer_iter *iter, u64 *ts)
 	if (rb_per_cpu_empty(cpu_buffer))
 		return NULL;
 
-	if (iter->head >= local_read(&iter->head_page->page->commit)) {
+	if (iter->head >= rb_page_size(iter->head_page)) {
 		rb_inc_iter(iter);
 		goto again;
 	}