From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Vaibhav Nagarnaik <vnagarnaik@google.com>,
David Sharp <dhsharp@google.com>,
Alexander Z Lam <lambchop468@gmail.com>, <stable@vger.kernel.org>,
Alexander Z Lam <azl@google.com>
Subject: [for-next-3.11][PATCH 3/4] tracing: Make TRACE_ITER_STOP_ON_FREE stop the correct buffer
Date: Sat, 03 Aug 2013 08:49:29 -0400 [thread overview]
Message-ID: <20130803125117.549439473@goodmis.org> (raw)
In-Reply-To: <20130803124926.157378122@goodmis.org>
[-- Attachment #1: 0003-tracing-Make-TRACE_ITER_STOP_ON_FREE-stop-the-correc.patch --]
[-- Type: text/plain, Size: 1085 bytes --]
From: Alexander Z Lam <azl@google.com>
Releasing the free_buffer file in an instance causes the global buffer
to be stopped when TRACE_ITER_STOP_ON_FREE is enabled. Operate on the
correct buffer.
Link: http://lkml.kernel.org/r/1375493777-17261-1-git-send-email-azl@google.com
Cc: Vaibhav Nagarnaik <vnagarnaik@google.com>
Cc: David Sharp <dhsharp@google.com>
Cc: Alexander Z Lam <lambchop468@gmail.com>
Cc: stable@vger.kernel.org # 3.10
Signed-off-by: Alexander Z Lam <azl@google.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/trace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index f5b35a5..531c9e6 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4469,7 +4469,7 @@ tracing_free_buffer_release(struct inode *inode, struct file *filp)
/* disable tracing ? */
if (trace_flags & TRACE_ITER_STOP_ON_FREE)
- tracing_off();
+ tracer_tracing_off(tr);
/* resize the ring buffer to 0 */
tracing_resize_ring_buffer(tr, 0, RING_BUFFER_ALL_CPUS);
--
1.7.10.4
next prev parent reply other threads:[~2013-08-03 12:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-03 12:49 [for-next-3.11][PATCH 0/4] tracing Steven Rostedt
2013-08-03 12:49 ` [for-next-3.11][PATCH 1/4] tracing: Fix fields of struct trace_iterator that are zeroed by mistake Steven Rostedt
2013-08-03 12:49 ` [for-next-3.11][PATCH 2/4] tracing: Fix trace_dump_stack() proto when CONFIG_TRACING is not set Steven Rostedt
2013-08-03 12:49 ` Steven Rostedt [this message]
2013-08-03 12:49 ` [for-next-3.11][PATCH 4/4] tracing: Fix reset of time stamps during trace_clock changes Steven Rostedt
2013-08-08 16:12 ` Steven Rostedt
2013-08-12 4:13 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130803125117.549439473@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=azl@google.com \
--cc=dhsharp@google.com \
--cc=fweisbec@gmail.com \
--cc=lambchop468@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=stable@vger.kernel.org \
--cc=vnagarnaik@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome