From c47dd7e8604b4e6bc79b2a59d9c4143690bf729d Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 22 Aug 2011 09:41:46 -0400
Subject: [PATCH] --- yaml --- r: 269074 b: refs/heads/master c:
 86b6ef21b80ac6565d172cdab4384404de007eea h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/kernel/trace/trace_events_filter.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 55f733207b2e..6fe1d03c9cba 100644
--- 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
index 6a642e278241..816d3d074979 100644
--- a/trunk/kernel/trace/trace_events_filter.c
+++ b/trunk/kernel/trace/trace_events_filter.c
@@ -2101,6 +2101,11 @@ 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,
@@ -2108,6 +2113,7 @@ static __init int ftrace_test_event_filter(void)
 
 		test_pred_visited = 0;
 		err = filter_match_preds(filter, &d->rec);
+		preempt_enable();
 
 		__free_filter(filter);