From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org> The name "ftrace" really refers to the function hook infrastructure. It is not about the trace_events. The function ftrace_define_fields_##call() is used to define how to process the trace_event fields. It has nothing to do with function tracing. Rename it. Signed-off-by: Steven Rostedt <rostedt@goodmis.org> --- include/trace/perf.h | 4 ++-- include/trace/trace_events.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/trace/perf.h b/include/trace/perf.h index c9af07652f08..4ad27492a63d 100644 --- a/include/trace/perf.h +++ b/include/trace/perf.h @@ -65,7 +65,7 @@ * * static struct trace_event_class __used event_class_<template> = { * .system = "<system>", - * .define_fields = ftrace_define_fields_<call>, + * .define_fields = trace_event_define_fields_<call>, * .fields = LIST_HEAD_INIT(event_class_##call.fields), * .raw_init = trace_event_raw_init, * .probe = trace_event_raw_event_##call, @@ -215,7 +215,7 @@ _TRACE_PERF_PROTO(call, PARAMS(proto)); \ static char print_fmt_##call[] = print; \ static struct trace_event_class __used __refdata event_class_##call = { \ .system = TRACE_SYSTEM_STRING, \ - .define_fields = ftrace_define_fields_##call, \ + .define_fields = trace_event_define_fields_##call, \ .fields = LIST_HEAD_INIT(event_class_##call.fields),\ .raw_init = trace_event_raw_init, \ .probe = trace_event_raw_event_##call, \ diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h index d88bd0f0844d..e27b87ef5724 100644 --- a/include/trace/trace_events.h +++ b/include/trace/trace_events.h @@ -407,7 +407,7 @@ static struct trace_event_functions trace_event_type_funcs_##call = { \ #undef DECLARE_EVENT_CLASS #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, func, print) \ static int notrace __init \ -ftrace_define_fields_##call(struct trace_event_call *event_call) \ +trace_event_define_fields_##call(struct trace_event_call *event_call) \ { \ struct trace_event_raw_##call field; \ int ret; \ -- 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/