summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2015-10-14 15:51:08 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2015-10-14 16:39:25 +0200
commit25188b9986cf6b0cadcf1bc1d1693a2e9c50ed47 (patch)
tree0af7e5eb8a99424990c857778842895deeeb4aa3
parent73917739334c6509833b0403b81d4a04a8784bdf (diff)
downloadlinux-25188b9986cf6b0cadcf1bc1d1693a2e9c50ed47.tar.gz
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>
-rw-r--r--arch/x86/kvm/x86.c2
1 files changed, 1 insertions, 1 deletions
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;