From: Steven Rostedt (Red Hat) Date: Tue, 14 Jan 2014 15:19:46 +0000 (-0500) Subject: tracing: Have trace buffer point back to trace_array X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=fb23eaf401bf37602ff9a222d99980ea4d219765;p=linux-edison.git 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 Signed-off-by: Greg Kroah-Hartman --- 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;