4 files changed, 27 insertions, 27 deletions

diff --git a/include/linux/module.h b/include/linux/module.h
index c883b86ea964..3e0d492682bb 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -336,7 +336,7 @@ struct module {
         const char **trace_bprintk_fmt_start;
 #endif
 #ifdef CONFIG_EVENT_TRACING
-        struct ftrace_event_call **trace_events;
+        struct trace_event_call **trace_events;
         unsigned int num_trace_events;
         struct trace_enum_map **trace_enums;
         unsigned int num_trace_enums;
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 61992cf2e977..d089d6d58ae0 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -483,7 +483,7 @@ struct perf_event {
         void                            *overflow_handler_context;
 
 #ifdef CONFIG_EVENT_TRACING
-        struct ftrace_event_call        *tp_event;
+        struct trace_event_call         *tp_event;
         struct event_filter             *filter;
 #ifdef CONFIG_FUNCTION_TRACER
         struct ftrace_ops               ftrace_ops;
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 76d1e38aabe1..d8b06abb264f 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -111,14 +111,14 @@ union bpf_attr;
 #define __SC_STR_ADECL(t, a)    #a
 #define __SC_STR_TDECL(t, a)    #t
 
-extern struct ftrace_event_class event_class_syscall_enter;
-extern struct ftrace_event_class event_class_syscall_exit;
+extern struct trace_event_class event_class_syscall_enter;
+extern struct trace_event_class event_class_syscall_exit;
 extern struct trace_event_functions enter_syscall_print_funcs;
 extern struct trace_event_functions exit_syscall_print_funcs;
 
 #define SYSCALL_TRACE_ENTER_EVENT(sname)                                \
         static struct syscall_metadata __syscall_meta_##sname;          \
-        static struct ftrace_event_call __used                          \
+        static struct trace_event_call __used                           \
           event_enter_##sname = {                                       \
                 .class                  = &event_class_syscall_enter,   \
                 {                                                       \
@@ -128,13 +128,13 @@ extern struct trace_event_functions exit_syscall_print_funcs;
                 .data                   = (void *)&__syscall_meta_##sname,\
                 .flags                  = TRACE_EVENT_FL_CAP_ANY,       \
         };                                                              \
-        static struct ftrace_event_call __used                          \
+        static struct trace_event_call __used                           \
           __attribute__((section("_ftrace_events")))                    \
          *__event_enter_##sname = &event_enter_##sname;
 
 #define SYSCALL_TRACE_EXIT_EVENT(sname)                                 \
         static struct syscall_metadata __syscall_meta_##sname;          \
-        static struct ftrace_event_call __used                          \
+        static struct trace_event_call __used                           \
           event_exit_##sname = {                                        \
                 .class                  = &event_class_syscall_exit,    \
                 {                                                       \
@@ -144,7 +144,7 @@ extern struct trace_event_functions exit_syscall_print_funcs;
                 .data                   = (void *)&__syscall_meta_##sname,\
                 .flags                  = TRACE_EVENT_FL_CAP_ANY,       \
         };                                                              \
-        static struct ftrace_event_call __used                          \
+        static struct trace_event_call __used                           \
           __attribute__((section("_ftrace_events")))                    \
         *__event_exit_##sname = &event_exit_##sname;
 
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index ae19233c7dd8..d10ab04a17b2 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -200,23 +200,23 @@ enum trace_reg {
 #endif
 };
 
-struct ftrace_event_call;
+struct trace_event_call;
 
-struct ftrace_event_class {
+struct trace_event_class {
         const char              *system;
         void                    *probe;
 #ifdef CONFIG_PERF_EVENTS
         void                    *perf_probe;
 #endif
-        int                     (*reg)(struct ftrace_event_call *event,
+        int                     (*reg)(struct trace_event_call *event,
                                        enum trace_reg type, void *data);
-        int                     (*define_fields)(struct ftrace_event_call *);
-        struct list_head        *(*get_fields)(struct ftrace_event_call *);
+        int                     (*define_fields)(struct trace_event_call *);
+        struct list_head        *(*get_fields)(struct trace_event_call *);
         struct list_head        fields;
-        int                     (*raw_init)(struct ftrace_event_call *);
+        int                     (*raw_init)(struct trace_event_call *);
 };
 
-extern int trace_event_reg(struct ftrace_event_call *event,
+extern int trace_event_reg(struct trace_event_call *event,
                             enum trace_reg type, void *data);
 
 struct ftrace_event_buffer {
@@ -269,9 +269,9 @@ enum {
         TRACE_EVENT_FL_KPROBE           = (1 << TRACE_EVENT_FL_KPROBE_BIT),
 };
 
-struct ftrace_event_call {
+struct trace_event_call {
         struct list_head        list;
-        struct ftrace_event_class *class;
+        struct trace_event_class *class;
         union {
                 char                    *name;
                 /* Set TRACE_EVENT_FL_TRACEPOINT flag when using "tp" */
@@ -298,13 +298,13 @@ struct ftrace_event_call {
         struct hlist_head __percpu      *perf_events;
         struct bpf_prog                 *prog;
 
-        int     (*perf_perm)(struct ftrace_event_call *,
+        int     (*perf_perm)(struct trace_event_call *,
                              struct perf_event *);
 #endif
 };
 
 static inline const char *
-ftrace_event_name(struct ftrace_event_call *call)
+ftrace_event_name(struct trace_event_call *call)
 {
         if (call->flags & TRACE_EVENT_FL_TRACEPOINT)
                 return call->tp ? call->tp->name : NULL;
@@ -351,7 +351,7 @@ enum {
 
 struct trace_event_file {
         struct list_head                list;
-        struct ftrace_event_call        *event_call;
+        struct trace_event_call         *event_call;
         struct event_filter             *filter;
         struct dentry                   *dir;
         struct trace_array              *tr;
@@ -388,7 +388,7 @@ struct trace_event_file {
         early_initcall(trace_init_flags_##name);
 
 #define __TRACE_EVENT_PERF_PERM(name, expr...)                          \
-        static int perf_perm_##name(struct ftrace_event_call *tp_event, \
+        static int perf_perm_##name(struct trace_event_call *tp_event, \
                                     struct perf_event *p_event)         \
         {                                                               \
                 return ({ expr; });                                     \
@@ -417,7 +417,7 @@ extern int filter_match_preds(struct event_filter *filter, void *rec);
 extern int filter_check_discard(struct trace_event_file *file, void *rec,
                                 struct ring_buffer *buffer,
                                 struct ring_buffer_event *event);
-extern int call_filter_check_discard(struct ftrace_event_call *call, void *rec,
+extern int call_filter_check_discard(struct trace_event_call *call, void *rec,
                                      struct ring_buffer *buffer,
                                      struct ring_buffer_event *event);
 extern enum event_trigger_type event_triggers_call(struct trace_event_file *file,
@@ -559,12 +559,12 @@ enum {
         FILTER_TRACE_FN,
 };
 
-extern int trace_event_raw_init(struct ftrace_event_call *call);
+extern int trace_event_raw_init(struct trace_event_call *call);