Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[linux-2.6-block.git] / kernel / trace / bpf_trace.c

diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index 0b113716bc7a37a04b8755f90fa1d9a16240ac36..08906007306d376699064af9b50ce02906ad2484 100644 (file)
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -1873,7 +1873,8 @@ static int __bpf_probe_register(struct bpf_raw_event_map *btp, struct bpf_prog *
        if (prog->aux->max_tp_access > btp->writable_size)
                return -EINVAL;
 
-       return tracepoint_probe_register(tp, (void *)btp->bpf_func, prog);
+       return tracepoint_probe_register_may_exist(tp, (void *)btp->bpf_func,
+                                                  prog);
 }
 
 int bpf_probe_register(struct bpf_raw_event_map *btp, struct bpf_prog *prog)