mm/cma: Move dma contiguous changes into a seperate config

We want to use CMA for allocating hash page table and real mode area for
PPC64. Hence move DMA contiguous related changes into a seperate config
so that ppc64 can enable CMA without requiring DMA contiguous.

Acked-by: Michal Nazarewicz <mina86@mina86.com>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
[removed defconfig changes]
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

1 files changed, 4 insertions, 16 deletions

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 07abd9d76f7f..10cd80af2aec 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -202,11 +202,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
@@ -215,17 +213,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