As we discussed, to remove the generic structure "ring_buffer" from the kernel, and switch it to "perf_buffer" and "trace_buffer", this patch series does just that. Anyone have any issues of me carrying this in my tree? I'll rebase it to v5.5-rc6 when it comes out, as it depends on some commits in v5.5-rc5. -- Steve Steven Rostedt (VMware) (3): perf: Make struct ring_buffer less ambiguous tracing: Rename trace_buffer to array_buffer tracing: Make struct ring_buffer less ambiguous ---- drivers/oprofile/cpu_buffer.c | 2 +- include/linux/perf_event.h | 6 +- include/linux/ring_buffer.h | 110 ++++++------- include/linux/trace_events.h | 8 +- include/trace/trace_events.h | 2 +- kernel/events/core.c | 42 ++--- kernel/events/internal.h | 34 ++-- kernel/events/ring_buffer.c | 54 +++---- kernel/trace/blktrace.c | 8 +- kernel/trace/ftrace.c | 8 +- kernel/trace/ring_buffer.c | 124 +++++++-------- kernel/trace/ring_buffer_benchmark.c | 2 +- kernel/trace/trace.c | 292 +++++++++++++++++------------------ kernel/trace/trace.h | 38 ++--- kernel/trace/trace_branch.c | 6 +- kernel/trace/trace_events.c | 20 +-- kernel/trace/trace_events_hist.c | 4 +- kernel/trace/trace_functions.c | 8 +- kernel/trace/trace_functions_graph.c | 14 +- kernel/trace/trace_hwlat.c | 2 +- kernel/trace/trace_irqsoff.c | 8 +- kernel/trace/trace_kdb.c | 8 +- kernel/trace/trace_kprobe.c | 4 +- kernel/trace/trace_mmiotrace.c | 12 +- kernel/trace/trace_output.c | 2 +- kernel/trace/trace_sched_wakeup.c | 20 +-- kernel/trace/trace_selftest.c | 26 ++-- kernel/trace/trace_syscalls.c | 8 +- kernel/trace/trace_uprobe.c | 2 +- 29 files changed, 437 insertions(+), 437 deletions(-)