hulk inclusion category: bugfix bugzilla: https://atomgit.com/openeuler/kernel/issues/8335 CVE: NA -------------------------------- Fix kabi-breakage by using KABI related MARCO because the uapi cannot include kabi.h. And because bpf_attr is a union and pahole show that there are another structure bigger than the modified one. Fixes: 526d613854fe ("bpf: pass attached BTF to the bpf_struct_ops subsystem") Signed-off-by: Luo Gengkun <luogengkun2@huawei.com> --- include/uapi/linux/bpf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index da549108042a..fc59c9ee3988 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -1413,10 +1413,12 @@ union bpf_attr { */ __u64 map_extra; +#if !defined(__GENKSYMS__) __s32 value_type_btf_obj_fd; /* fd pointing to a BTF * type data for * btf_vmlinux_value_type_id. */ +#endif }; struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */ -- 2.34.1