From: "Steven Rostedt (Red Hat)" The name "ftrace" really refers to the function hook infrastructure. It is not about the trace_events. The structure ftrace_event_type_funcs_##call is used to define how the trace_events will be printed. It has nothing to do with function tracing. Rename it. Signed-off-by: Steven Rostedt --- include/trace/perf.h | 4 ++-- include/trace/trace_events.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/trace/perf.h b/include/trace/perf.h index 1b635c63c600..c9af07652f08 100644 --- a/include/trace/perf.h +++ b/include/trace/perf.h @@ -231,7 +231,7 @@ static struct trace_event_call __used event_##call = { \ { \ .tp = &__tracepoint_##call, \ }, \ - .event.funcs = &ftrace_event_type_funcs_##template, \ + .event.funcs = &trace_event_type_funcs_##template, \ .print_fmt = print_fmt_##template, \ .flags = TRACE_EVENT_FL_TRACEPOINT, \ }; \ @@ -248,7 +248,7 @@ static struct trace_event_call __used event_##call = { \ { \ .tp = &__tracepoint_##call, \ }, \ - .event.funcs = &ftrace_event_type_funcs_##call, \ + .event.funcs = &trace_event_type_funcs_##call, \ .print_fmt = print_fmt_##call, \ .flags = TRACE_EVENT_FL_TRACEPOINT, \ }; \ diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h index 18c7c0248aeb..d88bd0f0844d 100644 --- a/include/trace/trace_events.h +++ b/include/trace/trace_events.h @@ -322,7 +322,7 @@ trace_raw_output_##call(struct trace_iterator *iter, int flags, \ \ return trace_handle_return(s); \ } \ -static struct trace_event_functions ftrace_event_type_funcs_##call = { \ +static struct trace_event_functions trace_event_type_funcs_##call = { \ .trace = trace_raw_output_##call, \ }; @@ -348,7 +348,7 @@ trace_raw_output_##call(struct trace_iterator *iter, int flags, \ trace_seq_init(p); \ return trace_output_call(iter, #call, print); \ } \ -static struct trace_event_functions ftrace_event_type_funcs_##call = { \ +static struct trace_event_functions trace_event_type_funcs_##call = { \ .trace = trace_raw_output_##call, \ }; -- 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/