summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2013-07-08 16:16:56 +0200
committerAlexander Graf <agraf@suse.de>2013-07-08 16:16:56 +0200
commit20f7462aac0b220c56231a15abec9ab99e897136 (patch)
tree0a2e033cc1dc203846262b311c3c3c88e1f0f8c2 /mm
parent03617c188f41eeeb4223c919ee7e66e5a114f2c6 (diff)
parentf825c736e75b11adb59ec52a4a1096efddd2ec97 (diff)
downloadlinux-20f7462aac0b220c56231a15abec9ab99e897136.tar.gz
linux-20f7462aac0b220c56231a15abec9ab99e897136.tar.bz2
linux-20f7462aac0b220c56231a15abec9ab99e897136.zip
Merge remote-tracking branch 'cmadma/for-v3.12-cma-dma' into kvm-ppc-next
Add prerequisite patch for CMA RMA allocation patches
Diffstat (limited to 'mm')
-rw-r--r--mm/Kconfig24
1 files changed, 24 insertions, 0 deletions
diff --git a/mm/Kconfig b/mm/Kconfig
index f5e698e30d4a..81bcb4bd422d 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -477,3 +477,27 @@ config FRONTSWAP
and swap data is stored as normal on the matching swap device.
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.