Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-block.git] / kernel / trace / trace_kprobe.c

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index ea8d0b094f1b51bac391c2460e2a2ca010de9d0b..6048f1be26d243156afd486518328ee538923a1b 100644 (file)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1643,7 +1643,7 @@ int bpf_get_kprobe_info(const struct perf_event *event, u32 *fd_type,
        if (perf_type_tracepoint)
                tk = find_trace_kprobe(pevent, group);
        else
-               tk = event->tp_event->data;
+               tk = trace_kprobe_primary_from_call(event->tp_event);
        if (!tk)
                return -EINVAL;