diff options
Diffstat (limited to 'kernel/trace')
-rw-r--r-- | kernel/trace/ftrace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index dab031fec85b..ff0ef41c6d93 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
@@ -2984,7 +2984,7 @@ static void ftrace_free_entry_rcu(struct rcu_head *rhp) | |||
2984 | container_of(rhp, struct ftrace_func_probe, rcu); | 2984 | container_of(rhp, struct ftrace_func_probe, rcu); |
2985 | 2985 | ||
2986 | if (entry->ops->free) | 2986 | if (entry->ops->free) |
2987 | entry->ops->free(&entry->data); | 2987 | entry->ops->free(entry->ops, entry->ip, &entry->data); |
2988 | kfree(entry); | 2988 | kfree(entry); |
2989 | } | 2989 | } |
2990 | 2990 | ||
@@ -3045,8 +3045,8 @@ register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, | |||
3045 | * for each function we find. We call the callback | 3045 | * for each function we find. We call the callback |
3046 | * to give the caller an opportunity to do so. | 3046 | * to give the caller an opportunity to do so. |
3047 | */ | 3047 | */ |
3048 | if (ops->callback) { | 3048 | if (ops->init) { |
3049 | if (ops->callback(rec->ip, &entry->data) < 0) { | 3049 | if (ops->init(ops, rec->ip, &entry->data) < 0) { |
3050 | /* caller does not like this func */ | 3050 | /* caller does not like this func */ |
3051 | kfree(entry); | 3051 | kfree(entry); |
3052 | continue; | 3052 | continue; |