Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM updates from Gleb Natapov:
 "The highlights of the release are nested EPT and pv-ticketlocks
  support (hypervisor part, guest part, which is most of the code, goes
  through tip tree).  Apart of that there are many fixes for all arches"

Fix up semantic conflicts as discussed in the pull request thread..

* 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (88 commits)
  ARM: KVM: Add newlines to panic strings
  ARM: KVM: Work around older compiler bug
  ARM: KVM: Simplify tracepoint text
  ARM: KVM: Fix kvm_set_pte assignment
  ARM: KVM: vgic: Bump VGIC_NR_IRQS to 256
  ARM: KVM: Bugfix: vgic_bytemap_get_reg per cpu regs
  ARM: KVM: vgic: fix GICD_ICFGRn access
  ARM: KVM: vgic: simplify vgic_get_target_reg
  KVM: MMU: remove unused parameter
  KVM: PPC: Book3S PR: Rework kvmppc_mmu_book3s_64_xlate()
  KVM: PPC: Book3S PR: Make instruction fetch fallback work for system calls
  KVM: PPC: Book3S PR: Don't corrupt guest state when kernel uses VMX
  KVM: x86: update masterclock when kvmclock_offset is calculated (v2)
  KVM: PPC: Book3S: Fix compile error in XICS emulation
  KVM: PPC: Book3S PR: return appropriate error when allocation fails
  arch: powerpc: kvm: add signed type cast for comparation
  KVM: x86: add comments where MMIO does not return to the emulator
  KVM: vmx: count exits to userspace during invalid guest emulation
  KVM: rename __kvm_io_bus_sort_cmp to kvm_io_bus_cmp
  kvm: optimize away THP checks in kvm_is_mmio_pfn()
  ...

1 files changed, 24 insertions, 0 deletions

diff --git a/mm/Kconfig b/mm/Kconfig
index 8028dcc6615c..6cdd27043303 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -478,6 +478,30 @@ config FRONTSWAP
 
           If unsure, say Y to enable frontswap.
 
+config CMA
+        bool "Contiguous Memory Allocator"
+        depends on HAVE_MEMBLOCK
+        select MIGRATION
+        select MEMORY_ISOLATION
+        help
+          This enables the Contiguous Memory Allocator which allows other
+          subsystems to allocate big physically-contiguous blocks of memory.
+          CMA reserves a region of memory and allows only movable pages to
+          be allocated from it. This way, the kernel can use the memory for
+          pagecache and when a subsystem requests for contiguous area, the
+          allocated pages are migrated away to serve the contiguous request.
+
+          If unsure, say "n".
+
+config CMA_DEBUG
+        bool "CMA debug messages (DEVELOPMENT)"
+        depends on DEBUG_KERNEL && CMA
+        help
+          Turns on debug messages in CMA.  This produces KERN_DEBUG
+          messages for every CMA call as well as various messages while
+          processing calls such as dma_alloc_from_contiguous().
+          This option does not affect warning and error messages.
+
 config ZBUD
         tristate
         default n