Merge tag 'nfsd-5.9' of git://git.linux-nfs.org/projects/cel/cel-2.6

[linux-2.6-microblaze.git] / kernel / trace / trace_uprobe.c

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 2a8e8e9..f4286c9 100644 (file)
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -1412,7 +1412,7 @@ int bpf_get_uprobe_info(const struct perf_event *event, u32 *fd_type,
        if (perf_type_tracepoint)
                tu = find_probe_event(pevent, group);
        else
-               tu = event->tp_event->data;
+               tu = trace_uprobe_primary_from_call(event->tp_event);
        if (!tu)
                return -EINVAL;
 
@@ -1456,7 +1456,6 @@ trace_uprobe_register(struct trace_event_call *event, enum trace_reg type,
        default:
                return 0;
        }
-       return 0;
 }
 
 static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs)