tracing: Make trace_marker use the correct per-instance buffer (2d71619c) · Commits · 戴 / test

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>

kernel/trace/trace.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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) {

Admin message