From 30b127e04ad5989252d6f666a53f803937ff5c4c Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Fri, 14 Oct 2011 10:44:25 -0400 Subject: [PATCH] --- yaml --- r: 269096 b: refs/heads/master c: 436fc280261dcfce5af38f08b89287750dc91cd2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 726b5dfb0f7c..cddecc857ce0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b5f8b31af57a8ce9e9f77864d9143b5e3304815 +refs/heads/master: 436fc280261dcfce5af38f08b89287750dc91cd2 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index cea16053f553..b24a72d35008 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -3903,8 +3903,6 @@ tracing_buffers_read(struct file *filp, char __user *ubuf, if (info->read < PAGE_SIZE) goto read; - info->read = 0; - trace_access_lock(info->cpu); ret = ring_buffer_read_page(info->tr->buffer, &info->spare, @@ -3914,6 +3912,8 @@ tracing_buffers_read(struct file *filp, char __user *ubuf, if (ret < 0) return 0; + info->read = 0; + read: size = PAGE_SIZE - info->read; if (size > count)