diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2025-09-11 19:34:37 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-09-11 19:34:37 +0300 |
| commit | 5d87e96a4971760c83e554c1d3ca99986d4f9b47 (patch) | |
| tree | 6623b8ed550fd713e09fd2466bfcafa2f3a6a393 /tools/testing/selftests/bpf/prog_tests/timer.c | |
| parent | f85981327a90c51e76f60e073cb6648b2f167226 (diff) | |
| parent | e59a039119c3ec241228adf12dca0dd4398104d0 (diff) | |
| download | linux-5d87e96a4971760c83e554c1d3ca99986d4f9b47.tar.xz | |
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/timer.c')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/timer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/timer.c b/tools/testing/selftests/bpf/prog_tests/timer.c index 049efb5e7823..86425939527c 100644 --- a/tools/testing/selftests/bpf/prog_tests/timer.c +++ b/tools/testing/selftests/bpf/prog_tests/timer.c @@ -87,6 +87,10 @@ void serial_test_timer(void) int err; timer_skel = timer__open_and_load(); + if (!timer_skel && errno == EOPNOTSUPP) { + test__skip(); + return; + } if (!ASSERT_OK_PTR(timer_skel, "timer_skel_load")) return; |