diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-05-21 16:22:33 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-31 08:46:09 +0200 |
| commit | 2e97942fe57864588774f173cf4cd7bb68968b76 (patch) | |
| tree | bf0eeda8c13a6e851ad755b7114ceaa82c51fd97 /kernel | |
| parent | 3771f0771154675d4a0ca780be2411f3cc357208 (diff) | |
| download | op-kernel-dev-2e97942fe57864588774f173cf4cd7bb68968b76.zip op-kernel-dev-2e97942fe57864588774f173cf4cd7bb68968b76.tar.gz | |
perf_events, trace: Fix perf_trace_destroy(), mutex went missing
Steve spotted I forgot to do the destroy under event_mutex.
Reported-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1274451913.1674.1707.camel@laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_event_perf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index 49c7abf..e6f6588 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c @@ -132,8 +132,9 @@ void perf_trace_destroy(struct perf_event *p_event) struct ftrace_event_call *tp_event = p_event->tp_event; int i; + mutex_lock(&event_mutex); if (--tp_event->perf_refcount > 0) - return; + goto out; if (tp_event->class->reg) tp_event->class->reg(tp_event, TRACE_REG_PERF_UNREGISTER); @@ -157,6 +158,8 @@ void perf_trace_destroy(struct perf_event *p_event) perf_trace_buf[i] = NULL; } } +out: + mutex_unlock(&event_mutex); } __kprobes void *perf_trace_buf_prepare(int size, unsigned short type, |
