mm/zswap: use workqueue to destroy pool

[karo-tx-linux.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index d6e9042b99e038dac0434031e6b1a7432671460c..1a6a28ebcb8b7fe85d266fcb113a0b882931e61c 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -192,6 +192,22 @@ config MEMORY_HOTPLUG_SPARSE
        def_bool y
        depends on SPARSEMEM && MEMORY_HOTPLUG
 
+config MEMORY_HOTPLUG_DEFAULT_ONLINE
+        bool "Online the newly added memory blocks by default"
+        default n
+        depends on MEMORY_HOTPLUG
+        help
+         This option sets the default policy setting for memory hotplug
+         onlining policy (/sys/devices/system/memory/auto_online_blocks) which
+         determines what happens to newly added memory regions. Policy setting
+         can always be changed at runtime.
+         See Documentation/memory-hotplug.txt for more information.
+
+         Say Y here if you want all hot-plugged memory blocks to appear in
+         'online' state by default.
+         Say N here if you want the default policy to keep all hot-plugged
+         memory blocks in 'offline' state.
+
 config MEMORY_HOTREMOVE
        bool "Allow for memory hot remove"
        select MEMORY_ISOLATION
@@ -551,7 +567,7 @@ config ZPOOL
          zsmalloc.
 
 config ZBUD
-       tristate "Low density storage for compressed pages"
+       tristate "Low (Up to 2x) density storage for compressed pages"
        default n
        help
          A special purpose allocator for storing compressed pages.
@@ -560,6 +576,16 @@ config ZBUD
          deterministic reclaim properties that make it preferable to a higher
          density approach when reclaim will be used.
 
+config Z3FOLD
+       tristate "Up to 3x density storage for compressed pages"
+       depends on ZPOOL
+       default n
+       help
+         A special purpose allocator for storing compressed pages.
+         It is designed to store up to three compressed pages per physical
+         page. It is a ZBUD derivative so the simplicity and determinism are
+         still there.
+
 config ZSMALLOC
        tristate "Memory allocator for compressed pages"
        depends on MMU