From: Uros Bizjak Date: Thu, 11 Oct 2018 17:40:43 +0000 (+0200) Subject: KVM/x86: Fix invvpid and invept register operand size in 64-bit mode X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8bf3bb3b979cfc4d8f4c71cb0a05ac9fcfed4dd8;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git KVM/x86: Fix invvpid and invept register operand size in 64-bit mode [ Upstream commit 5ebb272b2ea7e02911a03a893f8d922d49f9bb4a ] Register operand size of invvpid and invept instruction in 64-bit mode has always 64 bits. Adjust inline function argument type to reflect correct size. Signed-off-by: Uros Bizjak Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 1c4e5eb8be83..f67fc0f359ff 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -1602,7 +1602,7 @@ static int __find_msr_index(struct vcpu_vmx *vmx, u32 msr) return -1; } -static inline void __invvpid(int ext, u16 vpid, gva_t gva) +static inline void __invvpid(unsigned long ext, u16 vpid, gva_t gva) { struct { u64 vpid : 16; @@ -1616,7 +1616,7 @@ static inline void __invvpid(int ext, u16 vpid, gva_t gva) : : "a"(&operand), "c"(ext) : "cc", "memory"); } -static inline void __invept(int ext, u64 eptp, gpa_t gpa) +static inline void __invept(unsigned long ext, u64 eptp, gpa_t gpa) { struct { u64 eptp, gpa;