2 files changed, 6 insertions, 6 deletions

diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index d10ab04a17b2..a1fa8ebaf684 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -219,7 +219,7 @@ struct trace_event_class {
 extern int trace_event_reg(struct trace_event_call *event,
                             enum trace_reg type, void *data);
 
-struct ftrace_event_buffer {
+struct trace_event_buffer {
         struct ring_buffer              *buffer;
         struct ring_buffer_event        *event;
         struct trace_event_file         *trace_file;
@@ -228,11 +228,11 @@ struct ftrace_event_buffer {
         int                             pc;
 };
 
-void *ftrace_event_buffer_reserve(struct ftrace_event_buffer *fbuffer,
+void *trace_event_buffer_reserve(struct trace_event_buffer *fbuffer,
                                   struct trace_event_file *trace_file,
                                   unsigned long len);
 
-void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer);
+void trace_event_buffer_commit(struct trace_event_buffer *fbuffer);
 
 enum {
         TRACE_EVENT_FL_FILTERED_BIT,
diff --git a/include/trace/perf.h b/include/trace/perf.h
index 1d10c2d2b2c4..b1d7399df449 100644
--- a/include/trace/perf.h
+++ b/include/trace/perf.h
@@ -155,7 +155,7 @@ ftrace_raw_event_##call(void *__data, proto)				\
 {                                                                       \
         struct trace_event_file *trace_file = __data;                   \
         struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
-        struct ftrace_event_buffer fbuffer;                             \
+        struct trace_event_buffer fbuffer;                              \
         struct ftrace_raw_##call *entry;                                \
         int __data_size;                                                \
                                                                         \
@@ -164,7 +164,7 @@ ftrace_raw_event_##call(void *__data, proto)				\
                                                                         \
         __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \
                                                                         \
-        entry = ftrace_event_buffer_reserve(&fbuffer, trace_file,       \
+        entry = trace_event_buffer_reserve(&fbuffer, trace_file,        \
                                  sizeof(*entry) + __data_size);         \
                                                                         \
         if (!entry)                                                     \
@@ -174,7 +174,7 @@ ftrace_raw_event_##call(void *__data, proto)				\
                                                                         \
         { assign; }                                                     \
                                                                         \
-        ftrace_event_buffer_commit(&fbuffer);                           \
+        trace_event_buffer_commit(&fbuffer);                            \
 }
 /*
  * The ftrace_test_probe is compiled out, it is only here as a build time check