Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd0e162d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 05455227 56457f38

arch/x86/kvm/mmu.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -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;

		}

		}

	}

	}

include/asm-generic/Kbuild

+1 −0
Original line number Original line Diff line number Diff line
@@ -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