diff options
| author | Huacai Chen <chenhuacai@loongson.cn> | 2023-11-01 05:55:00 +0300 |
|---|---|---|
| committer | Huacai Chen <chenhuacai@loongson.cn> | 2023-11-01 05:55:00 +0300 |
| commit | a6bdc082ad1c91d389a6ba0c7a1945818f732114 (patch) | |
| tree | fa630701d5d2a8bc1ab8c4abf759663bbb81aeeb /tools/testing/selftests/bpf/prog_tests/libbpf_str.c | |
| parent | ffc253263a1375a65fa6c9f62a893e9767fbebfa (diff) | |
| parent | 99c9991f4e5d77328187187d0c921a3b62bfa998 (diff) | |
| download | linux-a6bdc082ad1c91d389a6ba0c7a1945818f732114.tar.xz | |
Merge 'bpf-next 2023-10-16' into loongarch-next
LoongArch architecture changes for 6.7 (BPF CPU v4 support) depend on
the bpf changes to fix conflictions in selftests and work, so merge them
to create a base.
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/libbpf_str.c')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/libbpf_str.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/libbpf_str.c b/tools/testing/selftests/bpf/prog_tests/libbpf_str.c index efb8bd43653c..c440ea3311ed 100644 --- a/tools/testing/selftests/bpf/prog_tests/libbpf_str.c +++ b/tools/testing/selftests/bpf/prog_tests/libbpf_str.c @@ -142,10 +142,14 @@ static void test_libbpf_bpf_map_type_str(void) /* Special case for map_type_name BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED * where it and BPF_MAP_TYPE_CGROUP_STORAGE have the same enum value * (map_type). For this enum value, libbpf_bpf_map_type_str() picks - * BPF_MAP_TYPE_CGROUP_STORAGE. + * BPF_MAP_TYPE_CGROUP_STORAGE. The same for + * BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE_DEPRECATED and + * BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE. */ if (strcmp(map_type_name, "BPF_MAP_TYPE_CGROUP_STORAGE_DEPRECATED") == 0) continue; + if (strcmp(map_type_name, "BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE_DEPRECATED") == 0) + continue; ASSERT_STREQ(buf, map_type_name, "exp_str_value"); } |