On Wed, 18 Dec 2019 17:14:01 +0100 Jiri Olsa <jolsa@xxxxxxxxxx> wrote: > On Sat, Dec 14, 2019 at 12:35:10PM +0100, Jiri Olsa wrote: > > On Fri, Dec 13, 2019 at 02:05:31PM -0500, Steven Rostedt wrote: > > > > SNIP > > > > > struct trace_array *tr = filp->private_data; > > > - struct ring_buffer *buffer = tr->trace_buffer.buffer; > > > + struct trace_buffer *buffer = tr->trace_buffer.buffer; > > > unsigned long val; > > > int ret; > > > > > > diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h > > > index 63bf60f79398..308fcd673102 100644 > > > --- a/kernel/trace/trace.h > > > +++ b/kernel/trace/trace.h > > > @@ -178,7 +178,7 @@ struct trace_option_dentry; > > > > > > struct trace_buffer { > > > struct trace_array *tr; > > > - struct ring_buffer *buffer; > > > + struct trace_buffer *buffer; > > > > perf change is fine, but 'trace_buffer' won't work because > > we already have 'struct trace_buffer' defined in here > > > > maybe we could change this name to trace_buffer_array? > > ..like in patch below? it's independent of your previous changes > > Actually, I would prefer to call it either trace_array_buffer, or just array_buffer. -- Steve