path: root/kernel
diff options
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-01-14 10:19:46 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-13 13:47:59 -0800
commitfb23eaf401bf37602ff9a222d99980ea4d219765 (patch)
treee8cefadf006b31f195650d38ed4e804876269a0c /kernel
parentf6333f55fc53a7b4202679cd0e975e67e13003d2 (diff)
tracing: Have trace buffer point back to trace_array
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>
Diffstat (limited to 'kernel')
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 5546ae9c84f..b7f5471ae51 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -5878,6 +5878,8 @@ allocate_trace_buffer(struct trace_array *tr, struct trace_buffer *buf, int size
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;