From: "Steven Rostedt (Red Hat)" The name "ftrace" really refers to the function hook infrastructure. It is not about the trace_events. The function ftrace_get_offsets_##call() is used to find the offset into dynamically allocated trace event fields for printing. It has nothing to do with function tracing. Rename it. Signed-off-by: Steven Rostedt --- include/trace/perf.h | 6 +++--- include/trace/trace_events.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/trace/perf.h b/include/trace/perf.h index 4ad27492a63d..1b5443cebedc 100644 --- a/include/trace/perf.h +++ b/include/trace/perf.h @@ -31,7 +31,7 @@ * local_save_flags(irq_flags); * pc = preempt_count(); * - * __data_size = ftrace_get_offsets_(&__data_offsets, args); + * __data_size = trace_event_get_offsets_(&__data_offsets, args); * * event = trace_event_buffer_lock_reserve(&buffer, trace_file, * event_->event.type, @@ -162,7 +162,7 @@ trace_event_raw_event_##call(void *__data, proto) \ if (trace_trigger_soft_disabled(trace_file)) \ return; \ \ - __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ + __data_size = trace_event_get_offsets_##call(&__data_offsets, args); \ \ entry = trace_event_buffer_reserve(&fbuffer, trace_file, \ sizeof(*entry) + __data_size); \ @@ -303,7 +303,7 @@ perf_trace_##call(void *__data, proto) \ int __data_size; \ int rctx; \ \ - __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ + __data_size = trace_event_get_offsets_##call(&__data_offsets, args); \ \ head = this_cpu_ptr(event_call->perf_events); \ if (__builtin_constant_p(!__task) && !__task && \ diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h index e27b87ef5724..43be3b0e44d3 100644 --- a/include/trace/trace_events.h +++ b/include/trace/trace_events.h @@ -485,7 +485,7 @@ trace_event_define_fields_##call(struct trace_event_call *event_call) \ #undef DECLARE_EVENT_CLASS #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \ -static inline notrace int ftrace_get_offsets_##call( \ +static inline notrace int trace_event_get_offsets_##call( \ struct trace_event_data_offsets_##call *__data_offsets, proto) \ { \ int __data_size = 0; \ -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/