diff options
author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-12-13 21:58:57 +0300 |
---|---|---|
committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2020-01-13 21:19:38 +0300 |
commit | 13292494379f92f532de71b31a54018336adc589 (patch) | |
tree | f9dc8c8e4e1c1b2114e5c330fed86f0dc2ac170d /kernel/trace/trace_branch.c | |
parent | 1c5eb4481e0151d579f738175497f998840f7bbc (diff) | |
download | linux-13292494379f92f532de71b31a54018336adc589.tar.xz |
tracing: Make struct ring_buffer less ambiguous
As there's two struct ring_buffers in the kernel, it causes some confusion.
The other one being the perf ring buffer. It was agreed upon that as neither
of the ring buffers are generic enough to be used globally, they should be
renamed as:
perf's ring_buffer -> perf_buffer
ftrace's ring_buffer -> trace_buffer
This implements the changes to the ring buffer that ftrace uses.
Link: https://lore.kernel.org/r/20191213140531.116b3200@gandalf.local.home
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace_branch.c')
-rw-r--r-- | kernel/trace/trace_branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c index d5989284a99a..eff099123aa2 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c @@ -32,10 +32,10 @@ probe_likely_condition(struct ftrace_likely_data *f, int val, int expect) { struct trace_event_call *call = &event_branch; struct trace_array *tr = branch_tracer; + struct trace_buffer *buffer; struct trace_array_cpu *data; struct ring_buffer_event *event; struct trace_branch *entry; - struct ring_buffer *buffer; unsigned long flags; int pc; const char *p; |