summaryrefslogtreecommitdiff
path: root/include/asm-generic
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-31 12:09:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-31 12:09:07 -0700
commitbd0e162d0312aa95e8b85ba883efddebf27be121 (patch)
tree5401fd64650a2c5965e43dccaa636bc814072043 /include/asm-generic
parent054552272e6e152ff40f8b7f164dd390a5a62097 (diff)
parent56457f38f212344fb38b250cfa7e7311c065022f (diff)
downloadlinux-3.10-bd0e162d0312aa95e8b85ba883efddebf27be121.tar.gz
linux-3.10-bd0e162d0312aa95e8b85ba883efddebf27be121.tar.bz2
linux-3.10-bd0e162d0312aa95e8b85ba883efddebf27be121.zip
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
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/Kbuild1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
index 53f91b1ae53..2c85a0f647b 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