---

yaml --- r: 269074 b: refs/heads/master c: 86b6ef2 h: refs/heads/master v: v3
git-mirror · Aug 30, 2011 · c47dd7e · c47dd7e
1 parent 21ec2a7
commit c47dd7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d0e78e380cd2802aa603a50e08220dfc681141c
+refs/heads/master: 86b6ef21b80ac6565d172cdab4384404de007eea
diff --git a/trunk/kernel/trace/trace_events_filter.c b/trunk/kernel/trace/trace_events_filter.c
@@ -2101,13 +2101,19 @@ static __init int ftrace_test_event_filter(void)
 			break;
 		}
 
+		/*
+		 * The preemption disabling is not really needed for self
+		 * tests, but the rcu dereference will complain without it.
+		 */
+		preempt_disable();
 		if (*d->not_visited)
 			walk_pred_tree(filter->preds, filter->root,
 				       test_walk_pred_cb,
 				       d->not_visited);
 
 		test_pred_visited = 0;
 		err = filter_match_preds(filter, &d->rec);
+		preempt_enable();
 
 		__free_filter(filter);