tracing: Move fields from event to class structure

[net-next-2.6.git] / include / linux / ftrace_event.h

diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index e665ed38b4bfd482c62fc10bcce6a496502a6eef..479c3c1876e6c487de7ff31da62b5d16110aebb7 100644 (file)
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -130,6 +130,9 @@ struct ftrace_event_class {
 #endif
        int                     (*reg)(struct ftrace_event_call *event,
                                       enum trace_reg type);
+       int                     (*define_fields)(struct ftrace_event_call *);
+       struct list_head        *(*get_fields)(struct ftrace_event_call *);
+       struct list_head        fields;
 };
 
 struct ftrace_event_call {
@@ -142,8 +145,6 @@ struct ftrace_event_call {
        int                     id;
        const char              *print_fmt;
        int                     (*raw_init)(struct ftrace_event_call *);
-       int                     (*define_fields)(struct ftrace_event_call *);
-       struct list_head        fields;
        int                     filter_active;
        struct event_filter     *filter;
        void                    *mod;