diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2025-09-11 09:34:37 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-09-11 09:34:37 -0700 |
| commit | 5d87e96a4971760c83e554c1d3ca99986d4f9b47 (patch) | |
| tree | 6623b8ed550fd713e09fd2466bfcafa2f3a6a393 /tools/testing/selftests/bpf/prog_tests/free_timer.c | |
| parent | selftests/bpf: Fix incorrect array size calculation (diff) | |
| parent | Merge tag 's390-6.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390... (diff) | |
| download | linux-5d87e96a4971760c83e554c1d3ca99986d4f9b47.tar.gz linux-5d87e96a4971760c83e554c1d3ca99986d4f9b47.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc5
Cross-merge BPF and other fixes after downstream PR.
No conflicts.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/free_timer.c')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/free_timer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/free_timer.c b/tools/testing/selftests/bpf/prog_tests/free_timer.c index b7b77a6b2979..0de8facca4c5 100644 --- a/tools/testing/selftests/bpf/prog_tests/free_timer.c +++ b/tools/testing/selftests/bpf/prog_tests/free_timer.c @@ -124,6 +124,10 @@ void test_free_timer(void) int err; skel = free_timer__open_and_load(); + if (!skel && errno == EOPNOTSUPP) { + test__skip(); + return; + } if (!ASSERT_OK_PTR(skel, "open_load")) return; |