From c35866678391861942b3836c219a8898a259255a Mon Sep 17 00:00:00 2001 From: Xiao Guangrong Date: Mon, 28 May 2012 14:10:43 +0800 Subject: KVM: MMU: fix huge page adapted on non-PAE host The huge page size is 4M on non-PAE host, but 2M page size is used in transparent_hugepage_adjust(), so the page we get after adjust the mapping level is not the head page, the BUG_ON() will be triggered Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity 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; } } -- cgit v0.10.2 From 56457f38f212344fb38b250cfa7e7311c065022f Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Mon, 28 May 2012 17:35:22 +0300 Subject: KVM: Export asm-generic/kvm_para.h Prevents build failures on non-KVM archs. Tested-by: Geert Uytterhoeven Signed-off-by: Avi Kivity 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 -- cgit v0.10.2