Re: [PATCH 2/3] tracing: Make trace_marker use the correctper-instance buffer
From: Steven Rostedt
Date: Mon Jul 01 2013 - 20:25:44 EST
On Mon, 2013年07月01日 at 15:31 -0700, Alexander Z Lam wrote:
>
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.
Thanks, I'll get this into this merge window. And maybe even mark it for
stable.
-- Steve
>
>
Cc: David Sharp <dhsharp@xxxxxxxxxx>
>
Cc: Vaibhav Nagarnaik <vnagarnaik@xxxxxxxxxx>
>
Cc: Alexander Z Lam <lambchop468@xxxxxxxxx>
>
Signed-off-by: Alexander Z Lam <azl@xxxxxxxxxx>
>
---
>
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 e0b0d2a..2f7307e 100644
>
--- a/kernel/trace/trace.c
>
+++ b/kernel/trace/trace.c
>
@@ -4351,6 +4351,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;
>
@@ -4410,7 +4411,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) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
http://vger.kernel.org/majordomo-info.html
Please read the FAQ at
http://www.tux.org/lkml/