diff options
author | Oleg Nesterov <oleg@redhat.com> | 2014-07-15 14:48:16 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-16 14:22:32 -0400 |
commit | 57375747b6fac0f6cf7b302c4a8adb9043ea8e3b (patch) | |
tree | f345ff7a52a9d3f8ee34239086b2fc3fb23881fd /kernel/trace | |
parent | 3e5454d6568c203bca712e1976b052c345f47b44 (diff) |
tracing: Kill destroy_call_preds()
Remove destroy_call_preds(). Its only caller, __trace_remove_event_call(),
can use free_event_filter() and nullify ->filter by hand.
Perhaps we could keep this trivial helper although imo it is pointless, but
then it should be static in trace_events.c.
Link: http://lkml.kernel.org/p/20140715184816.GA20495@redhat.com
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
-rw-r--r-- | kernel/trace/trace_events.c | 3 | ||||
-rw-r--r-- | kernel/trace/trace_events_filter.c | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 85914edf5059..0d8ee29f6b9a 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c | |||
@@ -1748,7 +1748,8 @@ static void __trace_remove_event_call(struct ftrace_event_call *call) | |||
1748 | { | 1748 | { |
1749 | event_remove(call); | 1749 | event_remove(call); |
1750 | trace_destroy_fields(call); | 1750 | trace_destroy_fields(call); |
1751 | destroy_call_preds(call); | 1751 | free_event_filter(call->filter); |
1752 | call->filter = NULL; | ||
1752 | } | 1753 | } |
1753 | 1754 | ||
1754 | static int probe_remove_event_call(struct ftrace_event_call *call) | 1755 | static int probe_remove_event_call(struct ftrace_event_call *call) |
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c index 30fc66f5cdca..1edec329be29 100644 --- a/kernel/trace/trace_events_filter.c +++ b/kernel/trace/trace_events_filter.c | |||
@@ -804,12 +804,6 @@ void free_event_filter(struct event_filter *filter) | |||
804 | __free_filter(filter); | 804 | __free_filter(filter); |
805 | } | 805 | } |
806 | 806 | ||
807 | void destroy_call_preds(struct ftrace_event_call *call) | ||
808 | { | ||
809 | __free_filter(call->filter); | ||
810 | call->filter = NULL; | ||
811 | } | ||
812 | |||
813 | static struct event_filter *__alloc_filter(void) | 807 | static struct event_filter *__alloc_filter(void) |
814 | { | 808 | { |
815 | struct event_filter *filter; | 809 | struct event_filter *filter; |