Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

bd0e162d · Linus Torvalds <[email protected]> · 2012-05-31 12:09:07 -07:00

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

Commit: bd0e162d0312aa95e8b85ba883efddebf27be121
Parents: 05455227 · 56457f38

Merge commit. Changes below are compared with the first parent: 05455227.

Changes

2 files changed · +2 −2

File	Status	Add	Del	Content
arch/x86/kvm/mmu.c	modified	+1	−2	View file
include/asm-generic/Kbuild	modified	+1	−0	View file

arch/x86/kvm/mmu.c

View file

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 72102e0..be3cea4 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;
 		}
 	}

include/asm-generic/Kbuild

View file

diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
index 53f91b1..2c85a0f 100644
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
@@ -8,6 +8,7 @@ header-y += int-ll64.h
 header-y += ioctl.h
 header-y += ioctls.h
 header-y += ipcbuf.h
+header-y += kvm_para.h
 header-y += mman-common.h
 header-y += mman.h
 header-y += msgbuf.h