Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next

Conflicts:
	mm/Kconfig

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

2 files changed, 5 insertions, 17 deletions

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 5daa2599ed48..e373671652b0 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -200,11 +200,9 @@ config DMA_SHARED_BUFFER
           APIs extension; the file's descriptor can then be passed on to other
           driver.
 
-config CMA
-        bool "Contiguous Memory Allocator"
-        depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK
-        select MIGRATION
-        select MEMORY_ISOLATION
+config DMA_CMA
+        bool "DMA Contiguous Memory Allocator"
+        depends on HAVE_DMA_CONTIGUOUS && CMA
         help
           This enables the Contiguous Memory Allocator which allows drivers
           to allocate big physically-contiguous blocks of memory for use with
@@ -213,17 +211,7 @@ config CMA
           For more information see <include/linux/dma-contiguous.h>.
           If unsure, say "n".
 
-if CMA
-
-config CMA_DEBUG
-        bool "CMA debug messages (DEVELOPMENT)"
-        depends on DEBUG_KERNEL
-        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.
-
+if  DMA_CMA
 comment "Default contiguous memory area size:"
 
 config CMA_SIZE_MBYTES
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 48029aa477d9..94e8a80e87f8 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -6,7 +6,7 @@ obj-y			:= core.o bus.o dd.o syscore.o \
                            attribute_container.o transport_class.o \
                            topology.o
 obj-$(CONFIG_DEVTMPFS)  += devtmpfs.o
-obj-$(CONFIG_CMA) += dma-contiguous.o
+obj-$(CONFIG_DMA_CMA) += dma-contiguous.o
 obj-y                   += power/
 obj-$(CONFIG_HAS_DMA)   += dma-mapping.o
 obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o