Commit f075bd0e authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Zeng Heng
Browse files

x86: Move gds_ucode_mitigated() declaration to header 

stable inclusion
from stable-v4.19.292
commit 648114eea913739f911768b63dfe51cb621a663a
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7XLNT
CVE: CVE-2022-40982

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=648114eea913739f911768b63dfe51cb621a663a



---------------------------

The declaration got placed in the .c file of the caller, but that
causes a warning for the definition:

arch/x86/kernel/cpu/bugs.c:682:6: error: no previous prototype for 'gds_ucode_mitigated' [-Werror=missing-prototypes]

Move it to a header where both sides can observe it instead.

Fixes: 81ac7e5d ("KVM: Add GDS_NO support to KVM")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Tested-by: default avatarDaniel Sneddon <daniel.sneddon@linux.intel.com>
Cc: stable@kernel.org
Link: https://lore.kernel.org/all/20230809130530.1913368-2-arnd%40kernel.org


Signed-off-by: default avatarZeng Heng <zengheng4@huawei.com>
parent 47bc06a8

arch/x86/include/asm/processor.h

+2 −0
Original line number Diff line number Diff line
@@ -1017,4 +1017,6 @@ enum taa_mitigations { 
	TAA_MITIGATION_TSX_DISABLED,

};



extern bool gds_ucode_mitigated(void);



#endif /* _ASM_X86_PROCESSOR_H */

arch/x86/kvm/x86.c

+0 −2
Original line number Diff line number Diff line
@@ -266,8 +266,6 @@ struct dfx_kvm_stats_debugfs_item dfx_debugfs_entries[] = { 


u64 __read_mostly host_xcr0;



extern bool gds_ucode_mitigated(void);



static int emulator_fix_hypercall(struct x86_emulate_ctxt *ctxt);



static inline void kvm_async_pf_hash_reset(struct kvm_vcpu *vcpu)