This is a note to let you know that I've just added the patch titled tracing: Make trace_marker use the correct per-instance 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_marker-use-the-correct-per-instance-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 <stable@xxxxxxxxxxxxxxx> know about it. >From 2d71619c59fac95a5415a326162fa046161b938c Mon Sep 17 00:00:00 2001 From: Alexander Z Lam <azl@xxxxxxxxxx> Date: Mon, 1 Jul 2013 15:31:24 -0700 Subject: tracing: Make trace_marker use the correct per-instance buffer From: Alexander Z Lam <azl@xxxxxxxxxx> commit 2d71619c59fac95a5415a326162fa046161b938c upstream. The trace_marker file was present for each new instance created, but it added the trace mark to the global trace buffer instead of to the instance's buffer. Link: http://lkml.kernel.org/r/1372717885-4543-2-git-send-email-azl@xxxxxxxxxx Signed-off-by: Alexander Z Lam <azl@xxxxxxxxxx> Cc: David Sharp <dhsharp@xxxxxxxxxx> Cc: Vaibhav Nagarnaik <vnagarnaik@xxxxxxxxxx> Cc: Alexander Z Lam <lambchop468@xxxxxxxxx> Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- kernel/trace/trace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -4328,6 +4328,7 @@ tracing_mark_write(struct file *filp, co size_t cnt, loff_t *fpos) { unsigned long addr = (unsigned long)ubuf; + struct trace_array *tr = filp->private_data; struct ring_buffer_event *event; struct ring_buffer *buffer; struct print_entry *entry; @@ -4387,7 +4388,7 @@ tracing_mark_write(struct file *filp, co local_save_flags(irq_flags); size = sizeof(*entry) + cnt + 2; /* possible \n added */ - buffer = global_trace.trace_buffer.buffer; + buffer = tr->trace_buffer.buffer; event = trace_buffer_lock_reserve(buffer, TRACE_PRINT, size, irq_flags, preempt_count()); if (!event) { Patches currently in stable-queue which might be from azl@xxxxxxxxxx are queue-3.10/tracing-get-trace_array-ref-counts-when-accessing-trace-files.patch queue-3.10/tracing-add-trace_array_get-put-to-event-handling.patch queue-3.10/tracing-protect-ftrace_trace_arrays-list-in-trace_events.c.patch queue-3.10/tracing-make-trace_marker-use-the-correct-per-instance-buffer.patch queue-3.10/tracing-add-trace_array_get-put-to-handle-instance-refs-better.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html