diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-01-13 10:20:59 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-01-13 10:20:59 -0300 |
| commit | 1aa77e716c6f2332f2d4664f747ff4eba731825b (patch) | |
| tree | bffb043cec73da6c79d4ec652e531f86344b160b /tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c | |
| parent | c0dd94558d0e473aa92254e1c48a47900c911e69 (diff) | |
| parent | 455e73a07f6e288b0061dfcf4fcf54fa9fe06458 (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and get in line with other trees, powerpc kernel
mostly this time, but BPF as well.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c b/tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c index f0c6c226aba8..7c79462d2702 100644 --- a/tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c +++ b/tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c @@ -47,9 +47,9 @@ static int load_prog(enum bpf_prog_type type) }; int fd; - fd = bpf_load_program(type, prog, ARRAY_SIZE(prog), "GPL", 0, NULL, 0); + fd = bpf_test_load_program(type, prog, ARRAY_SIZE(prog), "GPL", 0, NULL, 0); if (CHECK_FAIL(fd < 0)) - perror("bpf_load_program"); + perror("bpf_test_load_program"); return fd; } |