diff options
| author |  Ingo Molnar <mingo@kernel.org>
| 2019-10-28 12:38:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org>
| 2019-10-28 12:38:26 +0100 |
| commit | 65133033ee6ee34724ea3d82d5d1cfc6839ffdae (patch) | |
| tree | 2fca9fd5630bbfd503a75e3cc69f30056a629c92 /kernel/trace/trace_event_perf.c | |
| parent | Merge tag 'perf-core-for-mingo-5.5-20191021' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | perf/headers: Fix spelling s/EACCESS/EACCES/, s/privilidge/privilege/ (diff) | |
| download | linux-65133033ee6ee34724ea3d82d5d1cfc6839ffdae.tar.gz linux-65133033ee6ee34724ea3d82d5d1cfc6839ffdae.tar.bz2 linux-65133033ee6ee34724ea3d82d5d1cfc6839ffdae.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_event_perf.c')
| -rw-r--r-- | kernel/trace/trace_event_perf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index 0917fee6ee7c..643e0b19920d 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c @@ -277,9 +277,11 @@ int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe) goto out; } + mutex_lock(&event_mutex); ret = perf_trace_event_init(tp_event, p_event); if (ret) destroy_local_trace_kprobe(tp_event); + mutex_unlock(&event_mutex); out: kfree(func); return ret; @@ -287,8 +289,10 @@ out: void perf_kprobe_destroy(struct perf_event *p_event) { + mutex_lock(&event_mutex); perf_trace_event_close(p_event); perf_trace_event_unreg(p_event); + mutex_unlock(&event_mutex); destroy_local_trace_kprobe(p_event->tp_event); } |