From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 14 Oct 2015 13:51:08 +0000 (+0200)
Subject: KVM: x86: fix previous commit for 32-bit
X-Git-Tag: v4.3-rc6~18^2~1
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=25188b9986cf6b0cadcf1bc1d1693a2e9c50ed47;p=karo-tx-linux.git

KVM: x86: fix previous commit for 32-bit

Unfortunately I only noticed this after pushing.

Fixes: f0d648bdf0a5bbc91da6099d5282f77996558ea4
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 6e03546faf2e..9a9a19830321 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7482,7 +7482,7 @@ void kvm_arch_sync_events(struct kvm *kvm)
 int __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa, u32 size)
 {
 	int i, r;
-	u64 hva;
+	unsigned long hva;
 	struct kvm_memslots *slots = kvm_memslots(kvm);
 	struct kvm_memory_slot *slot, old;