rk: revert to v3.10

[firefly-linux-kernel-4.4.55.git] / drivers / base / Kconfig

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 4fe77b887457ca08edfb114643ff8c87e369a500..07abd9d76f7ff731eaef404c9eb84a3d227bc1e0 100644 (file)
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -187,14 +187,6 @@ config GENERIC_CPU_DEVICES
        bool
        default n
 
-config HAVE_CPU_AUTOPROBE
-       def_bool ARCH_HAS_CPU_AUTOPROBE
-
-config GENERIC_CPU_AUTOPROBE
-       bool
-       depends on !ARCH_HAS_CPU_AUTOPROBE
-       select HAVE_CPU_AUTOPROBE
-
 config SOC_BUS
        bool
 
@@ -210,9 +202,11 @@ config DMA_SHARED_BUFFER
          APIs extension; the file's descriptor can then be passed on to other
          driver.
 
-config DMA_CMA
-       bool "DMA Contiguous Memory Allocator"
-       depends on HAVE_DMA_CONTIGUOUS && CMA
+config CMA
+       bool "Contiguous Memory Allocator"
+       depends on HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK
+       select MIGRATION
+       select MEMORY_ISOLATION
        help
          This enables the Contiguous Memory Allocator which allows drivers
          to allocate big physically-contiguous blocks of memory for use with
@@ -221,7 +215,17 @@ config DMA_CMA
          For more information see <include/linux/dma-contiguous.h>.
          If unsure, say "n".
 
-if  DMA_CMA
+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.
+
 comment "Default contiguous memory area size:"
 
 config CMA_SIZE_MBYTES