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
Unified · Split
| @@ -2595,8 +2595,7 @@ static void transparent_hugepage_adjust(struct kvm_vcpu *vcpu, · 2594 unmodified lines | |||
| 2595 | *gfnp = gfn; | 2595 | *gfnp = gfn; |
| 2596 | kvm_release_pfn_clean(pfn); | 2596 | kvm_release_pfn_clean(pfn); |
| 2597 | pfn &= ~mask; | 2597 | pfn &= ~mask; |
| 2598 | if (!get_page_unless_zero(pfn_to_page(pfn))) | 2598 | kvm_get_pfn(pfn); |
| 2599 | BUG(); | ||
| 2600 | *pfnp = pfn; | 2599 | *pfnp = pfn; |
| 2601 | } | 2600 | } |
| 2602 | } | 2601 | } |
| @@ -8,6 +8,7 @@ header-y += int-ll64.h · 7 unmodified lines | |||
| 8 | header-y += ioctl.h | 8 | header-y += ioctl.h |
| 9 | header-y += ioctls.h | 9 | header-y += ioctls.h |
| 10 | header-y += ipcbuf.h | 10 | header-y += ipcbuf.h |
| 11 | header-y += kvm_para.h | ||
| 11 | header-y += mman-common.h | 12 | header-y += mman-common.h |
| 12 | header-y += mman.h | 13 | header-y += mman.h |
| 13 | header-y += msgbuf.h | 14 | header-y += msgbuf.h |