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); }