From 13292494379f92f532de71b31a54018336adc589 Mon Sep 17 00:00:00 2001 From: "Steven Rostedt (VMware)" Date: Fri, 13 Dec 2019 13:58:57 -0500 Subject: 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) --- include/trace/trace_events.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/trace') diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h index 472b33d23a10..13a58d453992 100644 --- a/include/trace/trace_events.h +++ b/include/trace/trace_events.h @@ -570,7 +570,7 @@ static inline notrace int trace_event_get_offsets_##call( \ * enum event_trigger_type __tt = ETT_NONE; * struct ring_buffer_event *event; * struct trace_event_raw_ *entry; <-- defined in stage 1 - * struct ring_buffer *buffer; + * struct trace_buffer *buffer; * unsigned long irq_flags; * int __data_size; * int pc; -- cgit From eba12ab71e71a2f82836c517596b6bd12664325c Mon Sep 17 00:00:00 2001 From: Hou Pengyang Date: Tue, 3 Mar 2015 21:48:18 +0000 Subject: tracing: Fix comments about trace/ftrace.h commit f42c85e74faa422cf0bc747ed808681145448f88 moved tracepoint's ftrace creation into include/trace/ftrace.h and trace/define_trace.h was deleted as a result. However some comment info does not adapt to the change, which is such a misguiding when reading related code. This patch fix this by moving trace/trace_events.h to , since tracepoint headers have already been moved to tarce/events/. Link: http://lkml.kernel.org/r/1425419298-61941-1-git-send-email-houpengyang@huawei.com Signed-off-by: Hou Pengyang [ Pulled from the archeological digging of my INBOX ] Signed-off-by: Steven Rostedt (VMware) --- include/trace/trace_events.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'include/trace') diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h index 13a58d453992..831048507fef 100644 --- a/include/trace/trace_events.h +++ b/include/trace/trace_events.h @@ -2,7 +2,8 @@ /* * Stage 1 of the trace events. * - * Override the macros in to include the following: + * Override the macros in the event tracepoint header + * to include the following: * * struct trace_event_raw_ { * struct trace_entry ent; @@ -223,7 +224,8 @@ TRACE_MAKE_SYSTEM_STR(); /* * Stage 3 of the trace events. * - * Override the macros in to include the following: + * Override the macros in the event tracepoint header + * to include the following: * * enum print_line_t * trace_raw_output_(struct trace_iterator *iter, int flags) @@ -555,7 +557,8 @@ static inline notrace int trace_event_get_offsets_##call( \ /* * Stage 4 of the trace events. * - * Override the macros in to include the following: + * Override the macros in the event tracepoint header + * to include the following: * * For those macros defined with TRACE_EVENT: * -- cgit