---

yaml --- r: 234483 b: refs/heads/master c: f76690a h: refs/heads/master i: 234481: 4c47853 234479: 8bbc8a2 v: v3
git-mirror · Feb 8, 2011 · 2613c20 · 2613c20
1 parent 122a7a5
commit 2613c20
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;
 	}