checkpatch: improve --git <commit-count> shortcut

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

diff --git a/mm/Kconfig b/mm/Kconfig
index 989f8f3d77e0d7bf552a008f5aee227a5c3ddcd0..2664c118b5d2eea6eee0aae18b9f62c333790a4e 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -192,6 +192,22 @@ config MEMORY_HOTPLUG_SPARSE
        def_bool y
        depends on SPARSEMEM && MEMORY_HOTPLUG
 
        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
 config MEMORY_HOTREMOVE
        bool "Allow for memory hot remove"
        select MEMORY_ISOLATION


@@ -268,11 +284,6 @@ config ARCH_ENABLE_HUGEPAGE_MIGRATION
 config PHYS_ADDR_T_64BIT
        def_bool 64BIT || ARCH_PHYS_ADDR_T_64BIT
 
 config PHYS_ADDR_T_64BIT
        def_bool 64BIT || ARCH_PHYS_ADDR_T_64BIT
 

-config ZONE_DMA_FLAG
-       int
-       default "0" if !ZONE_DMA
-       default "1"
-

 config BOUNCE
        bool "Enable bounce buffers"
        default y
 config BOUNCE
        bool "Enable bounce buffers"
        default y


@@ -393,6 +404,7 @@ config TRANSPARENT_HUGEPAGE
        bool "Transparent Hugepage Support"
        depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE
        select COMPACTION
        bool "Transparent Hugepage Support"
        depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE
        select COMPACTION

+       select RADIX_TREE_MULTIORDER

        help
          Transparent Hugepages allows the kernel to use huge pages and
          huge tlb transparently to the applications whenever possible.
        help
          Transparent Hugepages allows the kernel to use huge pages and
          huge tlb transparently to the applications whenever possible.


@@ -556,7 +568,7 @@ config ZPOOL
          zsmalloc.
 
 config ZBUD
          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.
        default n
        help
          A special purpose allocator for storing compressed pages.


@@ -565,6 +577,16 @@ config ZBUD
          deterministic reclaim properties that make it preferable to a higher
          density approach when reclaim will be used.
 
          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
 config ZSMALLOC
        tristate "Memory allocator for compressed pages"
        depends on MMU