From: Uros Bizjak <ubizjak@gmail.com>
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: http://git.lede-project.org./?a=commitdiff_plain;h=5ebb272b2ea7e02911a03a893f8d922d49f9bb4a;p=openwrt%2Fstaging%2Fblogic.git

KVM/x86: Fix invvpid and invept register operand size in 64-bit mode

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 <ubizjak@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 6f44d3a63434..05a0e8f80f68 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2070,7 +2070,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;
@@ -2085,7 +2085,7 @@ static inline void __invvpid(int ext, u16 vpid, gva_t gva)
     BUG_ON(error);
 }
 
-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;