aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/ftrace_event.h1
-rw-r--r--kernel/trace/trace_events.c1
-rw-r--r--kernel/trace/trace_events_filter.c20
3 files changed, 0 insertions, 22 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index cff3106ffe2c..738d46539269 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -404,7 +404,6 @@ enum event_trigger_type {
404 ETT_EVENT_ENABLE = (1 << 3), 404 ETT_EVENT_ENABLE = (1 << 3),
405}; 405};
406 406
407extern void destroy_preds(struct ftrace_event_file *file);
408extern void destroy_call_preds(struct ftrace_event_call *call); 407extern void destroy_call_preds(struct ftrace_event_call *call);
409extern int filter_match_preds(struct event_filter *filter, void *rec); 408extern int filter_match_preds(struct event_filter *filter, void *rec);
410 409
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 2de53628689f..85914edf5059 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -1621,7 +1621,6 @@ static void event_remove(struct ftrace_event_call *call)
1621 if (file->event_call != call) 1621 if (file->event_call != call)
1622 continue; 1622 continue;
1623 ftrace_event_enable_disable(file, 0); 1623 ftrace_event_enable_disable(file, 0);
1624 destroy_preds(file);
1625 /* 1624 /*
1626 * The do_for_each_event_file() is 1625 * The do_for_each_event_file() is
1627 * a double loop. After finding the call for this 1626 * a double loop. After finding the call for this
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 8a8631926a07..30fc66f5cdca 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -810,26 +810,6 @@ void destroy_call_preds(struct ftrace_event_call *call)
810 call->filter = NULL; 810 call->filter = NULL;
811} 811}
812 812
813static void destroy_file_preds(struct ftrace_event_file *file)
814{
815 __free_filter(file->filter);
816 file->filter = NULL;
817}
818
819/*
820 * Called when destroying the ftrace_event_file.
821 * The file is being freed, so we do not need to worry about
822 * the file being currently used. This is for module code removing
823 * the tracepoints from within it.
824 */
825void destroy_preds(struct ftrace_event_file *file)
826{
827 if (file->event_call->flags & TRACE_EVENT_FL_USE_CALL_FILTER)
828 destroy_call_preds(file->event_call);
829 else
830 destroy_file_preds(file);
831}
832
833static struct event_filter *__alloc_filter(void) 813static struct event_filter *__alloc_filter(void)
834{ 814{
835 struct event_filter *filter; 815 struct event_filter *filter;