diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-10-14 16:35:15 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-10-14 16:40:46 +0200 |
| commit | bff98d3b01e0420bfd027d8f320cdc9869f6cc2b (patch) | |
| tree | 580e6695c23c0dc7c49f6835430be049d252a679 /arch/x86/kvm/x86.c | |
| parent | 58f800d5ace99c49e6418cb5757d868f2746acb4 (diff) | |
| parent | b10d92a54dac25a6152f1aa1ffc95c12908035ce (diff) | |
Merge branch 'kvm-master' into HEAD
Merge more important SMM fixes.
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index ba1a968b829a..e28954d2698a 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7564,7 +7564,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; |