2 files changed, 5 insertions, 4 deletions

diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index ac8c6f8cf242..8544f121d9f1 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -112,8 +112,8 @@ struct ftrace_event_call {
         struct dentry           *dir;
         struct trace_event      *event;
         int                     enabled;
-        int                     (*regfunc)(void);
-        void                    (*unregfunc)(void);
+        int                     (*regfunc)(void *);
+        void                    (*unregfunc)(void *);
         int                     id;
         int                     (*raw_init)(void);
         int                     (*show_format)(struct trace_seq *s);
@@ -122,6 +122,7 @@ struct ftrace_event_call {
         int                     filter_active;
         struct event_filter     *filter;
         void                    *mod;
+        void                    *data;
 
         atomic_t                profile_count;
         int                     (*profile_enable)(struct ftrace_event_call *);
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 25d3b02a06f8..46d81b5e8610 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -568,7 +568,7 @@ static void ftrace_raw_event_##call(proto)				\
                 trace_nowake_buffer_unlock_commit(event, irq_flags, pc); \
 }                                                                       \
                                                                         \
-static int ftrace_raw_reg_event_##call(void)                            \
+static int ftrace_raw_reg_event_##call(void *ptr)                       \
 {                                                                       \
         int ret;                                                        \
                                                                         \
@@ -579,7 +579,7 @@ static int ftrace_raw_reg_event_##call(void)				\
         return ret;                                                     \
 }                                                                       \
                                                                         \
-static void ftrace_raw_unreg_event_##call(void)                         \
+static void ftrace_raw_unreg_event_##call(void *ptr)                    \
 {                                                                       \
         unregister_trace_##call(ftrace_raw_event_##call);               \
 }                                                                       \