From c254545d5f76c114b45149ebbe226b6fe595993a Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri, 21 May 2010 15:13:59 +0200
Subject: [PATCH] --- yaml --- r: 205243 b: refs/heads/master c:
 8ed92280be013180e24c84456ab6babcb07037cc h: refs/heads/master i:   205241:
 74ac8de12a75b412e604677bd6672e48cd3e8584   205239:
 1cd1b3a33f2a57af0d09ab25e5f2a06040f34ddc v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/perf_event.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 770d6a03f253..05e6c131de05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecc55f84b2e9741f29daa787ded93986df6cbe17
+refs/heads/master: 8ed92280be013180e24c84456ab6babcb07037cc
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index 4bd3b597bcca..b39bec346e80 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -4613,12 +4613,10 @@ void perf_tp_event(u64 addr, u64 count, void *record, int entry_size,
 	perf_sample_data_init(&data, addr);
 	data.raw = &raw;
 
-	rcu_read_lock();
 	hlist_for_each_entry_rcu(event, node, head, hlist_entry) {
 		if (perf_tp_event_match(event, &data, regs))
 			perf_swevent_add(event, count, 1, &data, regs);
 	}
-	rcu_read_unlock();
 
 	perf_swevent_put_recursion_context(rctx);
 }