Return-Path: Message-Id: <20130702202426.964214759@goodmis.org> Date: Tue, 02 Jul 2013 16:22:27 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Andrew Morton , David Sharp , Vaibhav Nagarnaik , Alexander Z Lam , , Alexander Z Lam Subject: [for-next][PATCH 11/14] tracing: Make trace_marker use the correct per-instance buffer References: <20130702202216.623562799@goodmis.org> Content-Disposition: inline; filename=0011-tracing-Make-trace_marker-use-the-correct-per-instan.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: From: Alexander Z Lam 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@google.com Cc: David Sharp Cc: Vaibhav Nagarnaik Cc: Alexander Z Lam Cc: stable@vger.kernel.org # 3.10 Signed-off-by: Alexander Z Lam Signed-off-by: Steven Rostedt --- kernel/trace/trace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 0dc5071..e04e711 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -4391,6 +4391,7 @@ tracing_mark_write(struct file *filp, const char __user *ubuf, 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; @@ -4450,7 +4451,7 @@ tracing_mark_write(struct file *filp, const char __user *ubuf, 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) { -- 1.7.10.4