summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Z Lam <azl@google.com>2013-07-01 15:31:24 -0700
committerSteven Rostedt <rostedt@goodmis.org>2013-07-01 21:08:15 -0400
commit2d71619c59fac95a5415a326162fa046161b938c (patch)
tree6146f93e2a629e840ad54e08b4246a7c7ff2a608
parentf1ed7c741fcd0c3d7d318e7c19813d89934b9296 (diff)
downloadlinux-stable-2d71619c59fac95a5415a326162fa046161b938c.tar.gz
linux-stable-2d71619c59fac95a5415a326162fa046161b938c.tar.bz2
linux-stable-2d71619c59fac95a5415a326162fa046161b938c.zip
tracing: Make trace_marker use the correct per-instance buffer
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 <dhsharp@google.com> Cc: Vaibhav Nagarnaik <vnagarnaik@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>
-rw-r--r--kernel/trace/trace.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 0dc50711d656..e04e7119633d 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) {