fujitsu-laptop: Clear build warnings

[cascardo/linux.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 3e9977a..886db21 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -508,21 +508,34 @@ config CMA_DEBUG
          processing calls such as dma_alloc_from_contiguous().
          This option does not affect warning and error messages.
 
-config ZBUD
-       tristate
-       default n
+config CMA_AREAS
+       int "Maximum count of the CMA areas"
+       depends on CMA
+       default 7
        help
-         A special purpose allocator for storing compressed pages.
-         It is designed to store up to two compressed pages per physical
-         page.  While this design limits storage density, it has simple and
-         deterministic reclaim properties that make it preferable to a higher
-         density approach when reclaim will be used.
+         CMA allows to create CMA areas for particular purpose, mainly,
+         used as device private area. This parameter sets the maximum
+         number of CMA area in the system.
+
+         If unsure, leave the default value "7".
+
+config MEM_SOFT_DIRTY
+       bool "Track memory changes"
+       depends on CHECKPOINT_RESTORE && HAVE_ARCH_SOFT_DIRTY && PROC_FS
+       select PROC_PAGE_MONITOR
+       help
+         This option enables memory changes tracking by introducing a
+         soft-dirty bit on pte-s. This bit it set when someone writes
+         into a page just as regular dirty bit, but unlike the latter
+         it can be cleared by hands.
+
+         See Documentation/vm/soft-dirty.txt for more details.
 
 config ZSWAP
        bool "Compressed cache for swap pages (EXPERIMENTAL)"
        depends on FRONTSWAP && CRYPTO=y
        select CRYPTO_LZO
-       select ZBUD
+       select ZPOOL
        default n
        help
          A lightweight compressed cache for swap pages.  It takes
@@ -538,17 +551,22 @@ config ZSWAP
          they have not be fully explored on the large set of potential
          configurations and workloads that exist.
 
-config MEM_SOFT_DIRTY
-       bool "Track memory changes"
-       depends on CHECKPOINT_RESTORE && HAVE_ARCH_SOFT_DIRTY && PROC_FS
-       select PROC_PAGE_MONITOR
+config ZPOOL
+       tristate "Common API for compressed memory storage"
+       default n
        help
-         This option enables memory changes tracking by introducing a
-         soft-dirty bit on pte-s. This bit it set when someone writes
-         into a page just as regular dirty bit, but unlike the latter
-         it can be cleared by hands.
+         Compressed memory storage API.  This allows using either zbud or
+         zsmalloc.
 
-         See Documentation/vm/soft-dirty.txt for more details.
+config ZBUD
+       tristate "Low density storage for compressed pages"
+       default n
+       help
+         A special purpose allocator for storing compressed pages.
+         It is designed to store up to two compressed pages per physical
+         page.  While this design limits storage density, it has simple and
+         deterministic reclaim properties that make it preferable to a higher
+         density approach when reclaim will be used.
 
 config ZSMALLOC
        tristate "Memory allocator for compressed pages"