From 2613c20629d68076b085dba632787810967864d9 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Thu, 27 Jan 2011 22:53:06 -0500 Subject: [PATCH] --- yaml --- r: 234483 b: refs/heads/master c: f76690afd05e3e163149310bdcd30234f93b3a7a h: refs/heads/master i: 234481: 4c4785338907043f855f87563a442c5cfee9eda9 234479: 8bbc8a2ecea2b0e5e7f7cb0877cae66ccc3bc25a v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_events_filter.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 91d8255e1e2e..ebb896aaff7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74e9e58c350a24139e268dd6857bbaa55c5aafcf +refs/heads/master: f76690afd05e3e163149310bdcd30234f93b3a7a diff --git a/trunk/kernel/trace/trace_events_filter.c b/trunk/kernel/trace/trace_events_filter.c index b6c910642a1e..2f5458e244a3 100644 --- a/trunk/kernel/trace/trace_events_filter.c +++ b/trunk/kernel/trace/trace_events_filter.c @@ -1388,6 +1388,10 @@ int apply_event_filter(struct ftrace_event_call *call, char *filter_string) if (!strcmp(strstrip(filter_string), "0")) { filter_disable_preds(call); + reset_preds(call->filter); + /* Make sure the filter is not being used */ + synchronize_sched(); + __free_preds(call->filter); remove_filter_string(call->filter); goto out_unlock; }