tracing: Pass the trace_array into ftrace_probe_ops functions

Pass the trace_array associated to a ftrace_probe_ops into the probe_ops
func(), init() and free() functions. The trace_array is the descriptor that
describes a tracing instance. This will help create the infrastructure that
will allow having function probes unique to tracing instances.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

1 files changed, 9 insertions, 7 deletions

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index f0d6e5aef53e..713bec614312 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -2470,7 +2470,8 @@ static void update_event_probe(struct event_probe_data *data)
 
 static void
 event_enable_probe(unsigned long ip, unsigned long parent_ip,
-                   struct ftrace_probe_ops *ops, void **_data)
+                   struct trace_array *tr, struct ftrace_probe_ops *ops,
+                   void **_data)
 {
         struct ftrace_func_mapper *mapper = ops->private_data;
         struct event_probe_data *data;
@@ -2486,7 +2487,8 @@ event_enable_probe(unsigned long ip, unsigned long parent_ip,
 
 static void
 event_enable_count_probe(unsigned long ip, unsigned long parent_ip,
-                         struct ftrace_probe_ops *ops, void **_data)
+                         struct trace_array *tr, struct ftrace_probe_ops *ops,
+                         void **_data)
 {
         struct ftrace_func_mapper *mapper = ops->private_data;
         struct event_probe_data *data;
@@ -2513,7 +2515,7 @@ event_enable_count_probe(unsigned long ip, unsigned long parent_ip,
 
 static int
 event_enable_print(struct seq_file *m, unsigned long ip,
-                      struct ftrace_probe_ops *ops, void *_data)
+                   struct ftrace_probe_ops *ops, void *_data)
 {
         struct ftrace_func_mapper *mapper = ops->private_data;
         struct event_probe_data *data;
@@ -2542,8 +2544,8 @@ event_enable_print(struct seq_file *m, unsigned long ip,
 }
 
 static int
-event_enable_init(struct ftrace_probe_ops *ops, unsigned long ip,
-                  void *_data)
+event_enable_init(struct ftrace_probe_ops *ops, struct trace_array *tr,
+                  unsigned long ip, void *_data)
 {
         struct ftrace_func_mapper *mapper = ops->private_data;
         struct event_probe_data *data = _data;
@@ -2559,8 +2561,8 @@ event_enable_init(struct ftrace_probe_ops *ops, unsigned long ip,
 }
 
 static void
-event_enable_free(struct ftrace_probe_ops *ops, unsigned long ip,
-                  void **_data)
+event_enable_free(struct ftrace_probe_ops *ops, struct trace_array *tr,
+                  unsigned long ip, void **_data)
 {
         struct ftrace_func_mapper *mapper = ops->private_data;
         struct event_probe_data *data;