diff options
| author | Alexander Z Lam <azl@google.com> | 2013-08-02 18:36:15 -0700 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-08-02 22:39:29 -0400 |
| commit | 711e124379e0f889e40e2f01d7f5d61936d3cd23 (patch) | |
| tree | 5264b7da9d3a01be06880c35ddcb6ccbc63b2f37 /kernel | |
| parent | e67bc51e574ffe3c4bc1e09cab7658b1e780b4ce (diff) | |
| download | op-kernel-dev-711e124379e0f889e40e2f01d7f5d61936d3cd23.zip op-kernel-dev-711e124379e0f889e40e2f01d7f5d61936d3cd23.tar.gz | |
tracing: Make TRACE_ITER_STOP_ON_FREE stop the correct buffer
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |
