Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[deliverable/linux.git] / include / trace / trace_events.h

diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h
index 0e9519d5eacb908def70164f5fabbbd9e267259a..43be3b0e44d3e65e3543289b5251d2a53fe9593f 100644 (file)
--- a/include/trace/trace_events.h
+++ b/include/trace/trace_events.h
@@ -138,7 +138,7 @@ TRACE_MAKE_SYSTEM_STR();
  *
  * Include the following:
  *
- * struct ftrace_data_offsets_<call> {
+ * struct trace_event_data_offsets_<call> {
  *     u32                             <item1>;
  *     u32                             <item2>;
  *     [...]
@@ -178,7 +178,7 @@ TRACE_MAKE_SYSTEM_STR();
 
 #undef DECLARE_EVENT_CLASS
 #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
-       struct ftrace_data_offsets_##call {                             \
+       struct trace_event_data_offsets_##call {                        \
                tstruct;                                                \
        };
 
@@ -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,              \
 };
 
@@ -407,7 +407,7 @@ static struct trace_event_functions ftrace_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;                                                        \
@@ -485,8 +485,8 @@ ftrace_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(                   \
-       struct ftrace_data_offsets_##call *__data_offsets, proto)       \
+static inline notrace int trace_event_get_offsets_##call(              \
+       struct trace_event_data_offsets_##call *__data_offsets, proto)  \
 {                                                                      \
        int __data_size = 0;                                            \
        int __maybe_unused __item_length;                               \