diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 23:09:07 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 23:09:07 +0400 |
commit | bd0e162d0312aa95e8b85ba883efddebf27be121 (patch) | |
tree | 5401fd64650a2c5965e43dccaa636bc814072043 /arch | |
parent | 054552272e6e152ff40f8b7f164dd390a5a62097 (diff) | |
parent | 56457f38f212344fb38b250cfa7e7311c065022f (diff) | |
download | linux-bd0e162d0312aa95e8b85ba883efddebf27be121.tar.xz |
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull two small kvm fixes from Avi Kivity:
"A build fix for non-kvm archs and a transparent hugepage refcount
bugfix on hosts with 4M pages."
* git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: Export asm-generic/kvm_para.h
KVM: MMU: fix huge page adapted on non-PAE host
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kvm/mmu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 72102e0ab7cb..be3cea4407ff 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -2595,8 +2595,7 @@ static void transparent_hugepage_adjust(struct kvm_vcpu *vcpu, *gfnp = gfn; kvm_release_pfn_clean(pfn); pfn &= ~mask; - if (!get_page_unless_zero(pfn_to_page(pfn))) - BUG(); + kvm_get_pfn(pfn); *pfnp = pfn; } } |