diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-08-08 14:03:51 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-08-08 14:04:17 -0700 |
| commit | e47fd9beb1cec00f43077d6b6238c8d30bd03ecf (patch) | |
| tree | 504747e4a88042565ad7957260915242ff687b61 /tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c | |
| parent | 91d516d4de48532d967a77967834e00c8c53dfe6 (diff) | |
| parent | ee9a43b7cfe2d8a3520335fea7d8ce71b8cabd9d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts or adjacent changes.
Link: https://patch.msgid.link/20240808170148.3629934-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c b/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c index 797de47f8197..c397336fe1ed 100644 --- a/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c @@ -216,7 +216,7 @@ static void test_uretprobe_regs_change(void) } #ifndef __NR_uretprobe -#define __NR_uretprobe 467 +#define __NR_uretprobe 335 #endif __naked unsigned long uretprobe_syscall_call_1(void) |