Revert "tracing: Move event storage for array from macro to standalone function"

[deliverable/linux.git] / include / linux / ftrace_event.h

diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index ffe642eb84fa33b8c3b24d8da5e262be63cb5535..cdc975929d152f84ee8de342cdae64dc925a4657 100644 (file)
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -202,6 +202,25 @@ extern int ftrace_event_reg(struct ftrace_event_call *event,
 int ftrace_output_event(struct trace_iterator *iter, struct ftrace_event_call *event,
                        char *fmt, ...);
 
+int ftrace_event_define_field(struct ftrace_event_call *call,
+                             char *type, int len, char *item, int offset,
+                             int field_size, int sign, int filter);
+
+struct ftrace_event_buffer {
+       struct ring_buffer              *buffer;
+       struct ring_buffer_event        *event;
+       struct ftrace_event_file        *ftrace_file;
+       void                            *entry;
+       unsigned long                   flags;
+       int                             pc;
+};
+
+void *ftrace_event_buffer_reserve(struct ftrace_event_buffer *fbuffer,
+                                 struct ftrace_event_file *ftrace_file,
+                                 unsigned long len);
+
+void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer);
+
 int ftrace_event_define_field(struct ftrace_event_call *call,
                              char *type, int len, char *item, int offset,
                              int field_size, int sign, int filter);
@@ -504,6 +523,10 @@ enum {
        FILTER_TRACE_FN,
 };
 
+#define EVENT_STORAGE_SIZE 128
+extern struct mutex event_storage_mutex;
+extern char event_storage[EVENT_STORAGE_SIZE];
+
 extern int trace_event_raw_init(struct ftrace_event_call *call);
 extern int trace_define_field(struct ftrace_event_call *call, const char *type,
                              const char *name, int offset, int size,