projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf...
[platform/kernel/linux-rpi.git]
/
kernel
/
trace
/
trace_uprobe.c
diff --git
a/kernel/trace/trace_uprobe.c
b/kernel/trace/trace_uprobe.c
index
fa09b33
..
eaa8005
100644
(file)
--- a/
kernel/trace/trace_uprobe.c
+++ b/
kernel/trace/trace_uprobe.c
@@
-1417,7
+1417,7
@@
static void uretprobe_perf_func(struct trace_uprobe *tu, unsigned long func,
int bpf_get_uprobe_info(const struct perf_event *event, u32 *fd_type,
const char **filename, u64 *probe_offset,
int bpf_get_uprobe_info(const struct perf_event *event, u32 *fd_type,
const char **filename, u64 *probe_offset,
- bool perf_type_tracepoint)
+
u64 *probe_addr,
bool perf_type_tracepoint)
{
const char *pevent = trace_event_name(event->tp_event);
const char *group = event->tp_event->class->system;
{
const char *pevent = trace_event_name(event->tp_event);
const char *group = event->tp_event->class->system;
@@
-1434,6
+1434,7
@@
int bpf_get_uprobe_info(const struct perf_event *event, u32 *fd_type,
: BPF_FD_TYPE_UPROBE;
*filename = tu->filename;
*probe_offset = tu->offset;
: BPF_FD_TYPE_UPROBE;
*filename = tu->filename;
*probe_offset = tu->offset;
+ *probe_addr = 0;
return 0;
}
#endif /* CONFIG_PERF_EVENTS */
return 0;
}
#endif /* CONFIG_PERF_EVENTS */