From 37e813d6ae18337400b464354ab991462f1ccfe8 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 17 Oct 2011 21:43:43 +0200 Subject: [PATCH] --- yaml --- r: 269101 b: refs/heads/master c: ee8f967b15179c34b923c9b87c06984e682b24cf h: refs/heads/master i: 269099: 532a5e2a04ab0f71bd32f2b3578c586648a05d48 v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c677772e30fc..b2be564ca440 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bc7298d3f63e55591477752eb809ab17031ec19 +refs/heads/master: ee8f967b15179c34b923c9b87c06984e682b24cf diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index f86efe90ca45..b24a72d35008 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -2720,9 +2720,9 @@ static const char readme_msg[] = "# cat /sys/kernel/debug/tracing/trace_options\n" "noprint-parent nosym-offset nosym-addr noverbose\n" "# echo print-parent > /sys/kernel/debug/tracing/trace_options\n" - "# echo 1 > /sys/kernel/debug/tracing/tracing_enabled\n" + "# echo 1 > /sys/kernel/debug/tracing/tracing_on\n" "# cat /sys/kernel/debug/tracing/trace > /tmp/trace.txt\n" - "# echo 0 > /sys/kernel/debug/tracing/tracing_enabled\n" + "# echo 0 > /sys/kernel/debug/tracing/tracing_on\n" ; static ssize_t @@ -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)