aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Z Lam <azl@google.com>2013-08-02 18:36:15 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-14 22:59:07 -0700
commite25d45868ca209a7d13772ed313a99ea0f9194d6 (patch)
tree1bad7be26c0c00c614f98319f9de00c4a91c2d0a
parent2d7ddf0a8fa2cffded6b8785f16e0c08c66f5007 (diff)
downloadvexpress-lsk-e25d45868ca209a7d13772ed313a99ea0f9194d6.tar.gz
tracing: Make TRACE_ITER_STOP_ON_FREE stop the correct buffer
commit 711e124379e0f889e40e2f01d7f5d61936d3cd23 upstream. 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 Signed-off-by: Alexander Z Lam <azl@google.com> Cc: Vaibhav Nagarnaik <vnagarnaik@google.com> Cc: David Sharp <dhsharp@google.com> Cc: Alexander Z Lam <lambchop468@gmail.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--kernel/trace/trace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 2a250a2aa02..1226a98c9be 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4438,7 +4438,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);