| From dced341b2d4f06668efaab33f88de5d287c0f45b Mon Sep 17 00:00:00 2001 |
| From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org> |
| Date: Tue, 14 Jan 2014 10:19:46 -0500 |
| Subject: tracing: Have trace buffer point back to trace_array |
| |
| From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org> |
| |
| commit dced341b2d4f06668efaab33f88de5d287c0f45b upstream. |
| |
| The trace buffer has a descriptor pointer that goes back to the trace |
| array. But it was never assigned. Luckily, nothing uses it (yet), but |
| it will in the future. |
| |
| Although nothing currently uses this, if any of the new features get |
| backported to older kernels, and because this is such a simple change, |
| I'm marking it for stable too. |
| |
| Fixes: 12883efb670c "tracing: Consolidate max_tr into main trace_array structure" |
| Signed-off-by: Steven Rostedt <rostedt@goodmis.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| kernel/trace/trace.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/kernel/trace/trace.c |
| +++ b/kernel/trace/trace.c |
| @@ -5883,6 +5883,8 @@ allocate_trace_buffer(struct trace_array |
| |
| rb_flags = trace_flags & TRACE_ITER_OVERWRITE ? RB_FL_OVERWRITE : 0; |
| |
| + buf->tr = tr; |
| + |
| buf->buffer = ring_buffer_alloc(size, rb_flags); |
| if (!buf->buffer) |
| return -ENOMEM; |
