diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-02-28 08:27:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-02-28 08:27:17 +0100 |
| commit | 9ed8f1a6e7670aadd5aef30456a90b456ed1b185 (patch) | |
| tree | b93479f7f70187b68d29b747ce02c720ddb11f42 /kernel/trace/bpf_trace.c | |
| parent | Merge tag 'perf-core-for-mingo-5.1-20190214' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | afs: Fix manually set volume location server list (diff) | |
| download | linux-9ed8f1a6e7670aadd5aef30456a90b456ed1b185.tar.xz linux-9ed8f1a6e7670aadd5aef30456a90b456ed1b185.zip | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/bpf_trace.c')
| -rw-r--r-- | kernel/trace/bpf_trace.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 088c2032ceaf..d64c00afceb5 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -1203,22 +1203,12 @@ static int __bpf_probe_register(struct bpf_raw_event_map *btp, struct bpf_prog * int bpf_probe_register(struct bpf_raw_event_map *btp, struct bpf_prog *prog) { - int err; - - mutex_lock(&bpf_event_mutex); - err = __bpf_probe_register(btp, prog); - mutex_unlock(&bpf_event_mutex); - return err; + return __bpf_probe_register(btp, prog); } int bpf_probe_unregister(struct bpf_raw_event_map *btp, struct bpf_prog *prog) { - int err; - - mutex_lock(&bpf_event_mutex); - err = tracepoint_probe_unregister(btp->tp, (void *)btp->bpf_func, prog); - mutex_unlock(&bpf_event_mutex); - return err; + return tracepoint_probe_unregister(btp->tp, (void *)btp->bpf_func, prog); } int bpf_get_perf_event_info(const struct perf_event *event, u32 *prog_id, |