Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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
This commit is contained in:
Linus Torvalds 2012-05-31 12:09:07 -07:00
commit bd0e162d03
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/x86/kvm/mmu.c
View file

@ -2595,8 +2595,7 @@ static void transparent_hugepage_adjust(struct kvm_vcpu *vcpu,
*gfnp = gfn; *gfnp = gfn;
kvm_release_pfn_clean(pfn); kvm_release_pfn_clean(pfn);
pfn &= ~mask; pfn &= ~mask;
if (!get_page_unless_zero(pfn_to_page(pfn))) kvm_get_pfn(pfn);
BUG();
*pfnp = pfn; *pfnp = pfn;
} }
} }

1
include/asm-generic/Kbuild
View file

@ -8,6 +8,7 @@ header-y += int-ll64.h
header-y += ioctl.h header-y += ioctl.h
header-y += ioctls.h header-y += ioctls.h
header-y += ipcbuf.h header-y += ipcbuf.h
header-y += kvm_para.h
header-y += mman-common.h header-y += mman-common.h
header-y += mman.h header-y += mman.h
header-y += msgbuf.h header-y += msgbuf.h