This is a note to let you know that I've just added the patch titled

    tracing: Make TRACE_ITER_STOP_ON_FREE stop the correct buffer

to the 3.10-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     tracing-make-trace_iter_stop_on_free-stop-the-correct-buffer.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From 711e124379e0f889e40e2f01d7f5d61936d3cd23 Mon Sep 17 00:00:00 2001
From: Alexander Z Lam <[email protected]>
Date: Fri, 2 Aug 2013 18:36:15 -0700
Subject: tracing: Make TRACE_ITER_STOP_ON_FREE stop the correct buffer

From: Alexander Z Lam <[email protected]>

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/[email protected]

Signed-off-by: Alexander Z Lam <[email protected]>
Cc: Vaibhav Nagarnaik <[email protected]>
Cc: David Sharp <[email protected]>
Cc: Alexander Z Lam <[email protected]>
Signed-off-by: Steven Rostedt <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 kernel/trace/trace.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4438,7 +4438,7 @@ tracing_free_buffer_release(struct inode
 
        /* 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);
 


Patches currently in stable-queue which might be from [email protected] are

queue-3.10/tracing-make-trace_iter_stop_on_free-stop-the-correct-buffer.patch
queue-3.10/tracing-fix-reset-of-time-stamps-during-trace_clock-changes.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to