From: "Steven Rostedt (Red Hat)" <[email protected]> The name "ftrace" really refers to the function hook infrastructure. It is not about the trace_events. The ftrace_event_buffer functions and data structures are for trace_events and not for function hooks. Rename them to trace_event_buffer*.
Signed-off-by: Steven Rostedt <[email protected]> --- include/linux/trace_events.h | 6 +++--- include/trace/perf.h | 6 +++--- kernel/trace/trace_events.c | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index d10ab04a17b2..a1fa8ebaf684 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -219,7 +219,7 @@ struct trace_event_class { extern int trace_event_reg(struct trace_event_call *event, enum trace_reg type, void *data); -struct ftrace_event_buffer { +struct trace_event_buffer { struct ring_buffer *buffer; struct ring_buffer_event *event; struct trace_event_file *trace_file; @@ -228,11 +228,11 @@ struct ftrace_event_buffer { int pc; }; -void *ftrace_event_buffer_reserve(struct ftrace_event_buffer *fbuffer, +void *trace_event_buffer_reserve(struct trace_event_buffer *fbuffer, struct trace_event_file *trace_file, unsigned long len); -void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer); +void trace_event_buffer_commit(struct trace_event_buffer *fbuffer); enum { TRACE_EVENT_FL_FILTERED_BIT, diff --git a/include/trace/perf.h b/include/trace/perf.h index 1d10c2d2b2c4..b1d7399df449 100644 --- a/include/trace/perf.h +++ b/include/trace/perf.h @@ -155,7 +155,7 @@ ftrace_raw_event_##call(void *__data, proto) \ { \ struct trace_event_file *trace_file = __data; \ struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\ - struct ftrace_event_buffer fbuffer; \ + struct trace_event_buffer fbuffer; \ struct ftrace_raw_##call *entry; \ int __data_size; \ \ @@ -164,7 +164,7 @@ ftrace_raw_event_##call(void *__data, proto) \ \ __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ \ - entry = ftrace_event_buffer_reserve(&fbuffer, trace_file, \ + entry = trace_event_buffer_reserve(&fbuffer, trace_file, \ sizeof(*entry) + __data_size); \ \ if (!entry) \ @@ -174,7 +174,7 @@ ftrace_raw_event_##call(void *__data, proto) \ \ { assign; } \ \ - ftrace_event_buffer_commit(&fbuffer); \ + trace_event_buffer_commit(&fbuffer); \ } /* * The ftrace_test_probe is compiled out, it is only here as a build time check diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 8df615ce3dc4..e5638c43b04d 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -190,9 +190,9 @@ int trace_event_raw_init(struct trace_event_call *call) } EXPORT_SYMBOL_GPL(trace_event_raw_init); -void *ftrace_event_buffer_reserve(struct ftrace_event_buffer *fbuffer, - struct trace_event_file *trace_file, - unsigned long len) +void *trace_event_buffer_reserve(struct trace_event_buffer *fbuffer, + struct trace_event_file *trace_file, + unsigned long len) { struct trace_event_call *event_call = trace_file->event_call; @@ -210,11 +210,11 @@ void *ftrace_event_buffer_reserve(struct ftrace_event_buffer *fbuffer, fbuffer->entry = ring_buffer_event_data(fbuffer->event); return fbuffer->entry; } -EXPORT_SYMBOL_GPL(ftrace_event_buffer_reserve); +EXPORT_SYMBOL_GPL(trace_event_buffer_reserve); static DEFINE_SPINLOCK(tracepoint_iter_lock); -static void output_printk(struct ftrace_event_buffer *fbuffer) +static void output_printk(struct trace_event_buffer *fbuffer) { struct trace_event_call *event_call; struct trace_event *event; @@ -241,7 +241,7 @@ static void output_printk(struct ftrace_event_buffer *fbuffer) spin_unlock_irqrestore(&tracepoint_iter_lock, flags); } -void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer) +void trace_event_buffer_commit(struct trace_event_buffer *fbuffer) { if (tracepoint_printk) output_printk(fbuffer); @@ -250,7 +250,7 @@ void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer) fbuffer->event, fbuffer->entry, fbuffer->flags, fbuffer->pc); } -EXPORT_SYMBOL_GPL(ftrace_event_buffer_commit); +EXPORT_SYMBOL_GPL(trace_event_buffer_commit); int trace_event_reg(struct trace_event_call *call, enum trace_reg type, void *data) -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
