diff options
| author |   Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-04-04 10:27:51 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-04-20 22:06:41 -0400 |
| commit | 1a48df0041c2756194e700affb0e2ff084092e28 (patch) | |
| tree | a01a385fc939edce96bd61bb7bce51caacfb9220 /kernel/trace/trace_events.c | |
| parent | ftrace: Remove printing of data in showing of a function probe (diff) | |
| download | linux-dev-1a48df0041c2756194e700affb0e2ff084092e28.tar.xz linux-dev-1a48df0041c2756194e700affb0e2ff084092e28.zip | |
ftrace: Remove data field from ftrace_func_probe structure
No users of the function probes uses the data field anymore. Remove it, and
change the init function to take a void *data parameter instead of a
void **data, because the init will just get the data that the registering
function was received, and there's no state after it is called.
The other functions for ftrace_probe_ops still take the data parameter, but
it will currently only be passed NULL. It will stay as a parameter for
future data to be passed to these functions.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace_events.c')
| -rw-r--r-- | kernel/trace/trace_events.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index ee308312fe87..37902107c44f 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -2543,11 +2543,10 @@ 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) + void *_data) { struct ftrace_func_mapper *mapper = ops->private_data; - struct event_probe_data **pdata = (struct event_probe_data **)_data; - struct event_probe_data *data = *pdata; + struct event_probe_data *data = _data; int ret; ret = ftrace_func_mapper_add_ip(mapper, ip, data); |