diff options
author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-04-04 09:56:26 -0400 |
---|---|---|
committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-04-20 22:06:39 -0400 |
commit | 0fe7e7e3f8391d4c9260b41cdb15c7917cb2e5b3 (patch) | |
tree | 72dea831cf971345304a352adb6dd7671b48669e /kernel | |
parent | fe014e24b6adfecdf8b3d0de1ef4d55a3eaf2b50 (diff) | |
download | linux-stable-0fe7e7e3f8391d4c9260b41cdb15c7917cb2e5b3.tar.gz linux-stable-0fe7e7e3f8391d4c9260b41cdb15c7917cb2e5b3.tar.bz2 linux-stable-0fe7e7e3f8391d4c9260b41cdb15c7917cb2e5b3.zip |
ftrace: Remove unused unregister_ftrace_function_probe() function
Nothing calls unregister_ftrace_function_probe(). Remove it as well as the
flag PROBE_TEST_DATA, as this function was the only one to set it.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/trace/ftrace.c | 18 | ||||
-rw-r--r-- | kernel/trace/trace.h | 3 |
2 files changed, 3 insertions, 18 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index ac47d1845fdb..5448089e6028 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -4061,12 +4061,11 @@ register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, enum { PROBE_TEST_FUNC = 1, - PROBE_TEST_DATA = 2 }; static void __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, - void *data, int flags) + int flags) { struct ftrace_ops_hash old_hash_ops; struct ftrace_func_entry *rec_entry; @@ -4119,9 +4118,6 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, if ((flags & PROBE_TEST_FUNC) && entry->ops != ops) continue; - if ((flags & PROBE_TEST_DATA) && entry->data != data) - continue; - /* do this last, since it is the most expensive */ if (func_g.search) { kallsyms_lookup(entry->ip, NULL, NULL, @@ -4167,22 +4163,14 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, } void -unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, - void *data) -{ - __unregister_ftrace_function_probe(glob, ops, data, - PROBE_TEST_FUNC | PROBE_TEST_DATA); -} - -void unregister_ftrace_function_probe_func(char *glob, struct ftrace_probe_ops *ops) { - __unregister_ftrace_function_probe(glob, ops, NULL, PROBE_TEST_FUNC); + __unregister_ftrace_function_probe(glob, ops, PROBE_TEST_FUNC); } void unregister_ftrace_function_probe_all(char *glob) { - __unregister_ftrace_function_probe(glob, NULL, NULL, 0); + __unregister_ftrace_function_probe(glob, NULL, 0); } static LIST_HEAD(ftrace_commands); diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index dbbdee21bcc4..507a62e9192e 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -964,9 +964,6 @@ extern int register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, void *data); extern void -unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, - void *data); -extern void unregister_ftrace_function_probe_func(char *glob, struct ftrace_probe_ops *ops); extern void unregister_ftrace_function_probe_all(char *glob); |