From: eillon <yezhenyu2@huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/IB103D CVE: NA ---------------------------------------------------------------------- Use KABI_EXTEND to skip KABI check of HDBSS feature. Signed-off-by: eillon <yezhenyu2@huawei.com> --- arch/arm64/include/asm/kvm_host.h | 4 ++-- include/linux/kvm_host.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 7c7e994cf12c..81898bb87c5e 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -644,10 +644,10 @@ struct kvm_vcpu_arch { #ifdef CONFIG_ARM64_HDBSS /* HDBSS registers info */ - struct { + KABI_EXTEND(struct { u64 br_el2; u64 prod_el2; - } hdbss; + } hdbss) #endif }; diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 560ff9dd2b27..3968797272b9 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -843,7 +843,7 @@ struct kvm { #endif char stats_id[KVM_STATS_NAME_SIZE]; #ifdef CONFIG_ARM64_HDBSS - bool enable_hdbss; + KABI_EXTEND(bool enable_hdbss) #endif }; -- 2.39.3