diff options
| author | Steven Rostedt (Red Hat) | 2014-01-14 16:19:46 +0100 |
|---|---|---|
| committer | Steven Rostedt | 2014-01-14 16:19:46 +0100 |
| commit | dced341b2d4f06668efaab33f88de5d287c0f45b (patch) | |
| tree | 549df748615b1e735c4d8d7254c8f63076280af2 /kernel/trace | |
| parent | ftrace: Fix synchronization location disabling and freeing ftrace_ops (diff) | |
| download | kernel-qcow2-linux-dced341b2d4f06668efaab33f88de5d287c0f45b.tar.gz kernel-qcow2-linux-dced341b2d4f06668efaab33f88de5d287c0f45b.tar.xz kernel-qcow2-linux-dced341b2d4f06668efaab33f88de5d287c0f45b.zip | |
tracing: Have trace buffer point back to trace_array
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.
Cc: stable@vger.kernel.org # v3.10+
Fixes: 12883efb670c "tracing: Consolidate max_tr into main trace_array structure"
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index e32a2f48dde1..cee9c1a552ab 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -5914,6 +5914,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; |