From 0f26f8c1d7801d31237a63c6f2a96ebe1caf1ae1 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Apr 20 2023 11:00:42 +0000 Subject: selftests/bpf: Fix progs/find_vma_fail1.c build error (bsc#1012628). --- diff --git a/patches.kernel.org/6.2.12-081-selftests-bpf-Fix-progs-find_vma_fail1.c-build.patch b/patches.kernel.org/6.2.12-081-selftests-bpf-Fix-progs-find_vma_fail1.c-build.patch new file mode 100644 index 0000000..2bf6a3b --- /dev/null +++ b/patches.kernel.org/6.2.12-081-selftests-bpf-Fix-progs-find_vma_fail1.c-build.patch @@ -0,0 +1,35 @@ +From: Alexei Starovoitov +Date: Fri, 10 Mar 2023 12:41:18 -0800 +Subject: [PATCH] selftests/bpf: Fix progs/find_vma_fail1.c build error. +References: bsc#1012628 +Patch-mainline: 6.2.12 +Git-commit: 32513d40d908b267508d37994753d9bd1600914b + +[ Upstream commit 32513d40d908b267508d37994753d9bd1600914b ] + +The commit 11e456cae91e ("selftests/bpf: Fix compilation errors: Assign a value to a constant") +fixed the issue cleanly in bpf-next. +This is an alternative fix in bpf tree to avoid merge conflict between bpf and bpf-next. + +Signed-off-by: Alexei Starovoitov +Signed-off-by: Sasha Levin +Signed-off-by: Jiri Slaby +--- + tools/testing/selftests/bpf/progs/find_vma_fail1.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/testing/selftests/bpf/progs/find_vma_fail1.c b/tools/testing/selftests/bpf/progs/find_vma_fail1.c +index b3b326b8..6dab9cff 100644 +--- a/tools/testing/selftests/bpf/progs/find_vma_fail1.c ++++ b/tools/testing/selftests/bpf/progs/find_vma_fail1.c +@@ -2,6 +2,7 @@ + /* Copyright (c) 2021 Facebook */ + #include "vmlinux.h" + #include ++#define vm_flags vm_start + + char _license[] SEC("license") = "GPL"; + +-- +2.35.3 + diff --git a/series.conf b/series.conf index 906f1f0..21ae31f 100644 --- a/series.conf +++ b/series.conf @@ -2308,6 +2308,7 @@ patches.kernel.org/6.2.12-078-power-supply-rk817-Fix-unsigned-comparison-wit.patch patches.kernel.org/6.2.12-079-power-supply-cros_usbpd-reclassify-default-cas.patch patches.kernel.org/6.2.12-080-power-supply-axp288_fuel_gauge-Added-check-for.patch + patches.kernel.org/6.2.12-081-selftests-bpf-Fix-progs-find_vma_fail1.c-build.patch ######################################################## # Build fixes that apply to the vanilla kernel too.