diff options
| author |   Andrii Nakryiko <andrii@kernel.org> | 2024-11-06 08:13:03 -0800 |
|---|---|---|
| committer | Andrii Nakryiko <andrii@kernel.org> | 2024-11-06 08:13:03 -0800 |
| commit | 5f67329cb29cf036c04c6eebdb929b20abf22c7c (patch) | |
| tree | 0326d5113b951346cff38d62bf7c34c6aefea07b /tools | |
| parent | Merge branch 'handle-possible-null-trusted-raw_tp-arguments' (diff) | |
| parent | uprobes: SRCU-protect uretprobe lifetime (with timeout) (diff) | |
| download | wireguard-linux-5f67329cb29cf036c04c6eebdb929b20abf22c7c.tar.xz wireguard-linux-5f67329cb29cf036c04c6eebdb929b20abf22c7c.zip | |
Merge tag 'perf-core-for-bpf-next' from tip tree
Stable tag for bpf-next's uprobe work.
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c b/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c index 4e6a9e9c0368..987d41af71d2 100644 --- a/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c +++ b/tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c @@ -463,7 +463,7 @@ static struct bin_attribute bin_attr_bpf_testmod_file __ro_after_init = { static int uprobe_ret_handler(struct uprobe_consumer *self, unsigned long func, - struct pt_regs *regs) + struct pt_regs *regs, __u64 *data) { regs->ax = 0x12345678deadbeef; |