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

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

diff --git a/mm/Kconfig b/mm/Kconfig
index 03cbfa072f42a7378ed57b8b1060641b31e7d97e..2664c118b5d2eea6eee0aae18b9f62c333790a4e 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -187,12 +187,27 @@ config MEMORY_HOTPLUG
        bool "Allow for memory hot-add"
        depends on SPARSEMEM || X86_64_ACPI_NUMA
        depends on ARCH_ENABLE_MEMORY_HOTPLUG
-       depends on (IA64 || X86 || PPC_BOOK3S_64 || SUPERH || S390)
 
 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
@@ -269,11 +284,6 @@ config ARCH_ENABLE_HUGEPAGE_MIGRATION
 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
@@ -394,6 +404,7 @@ config TRANSPARENT_HUGEPAGE
        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.
@@ -557,7 +568,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.
@@ -566,6 +577,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
@@ -652,10 +673,9 @@ config IDLE_PAGE_TRACKING
 
 config ZONE_DEVICE
        bool "Device memory (pmem, etc...) hotplug support" if EXPERT
-       default !ZONE_DMA
-       depends on !ZONE_DMA
        depends on MEMORY_HOTPLUG
        depends on MEMORY_HOTREMOVE
+       depends on SPARSEMEM_VMEMMAP
        depends on X86_64 #arch_add_memory() comprehends device memory
 
        help
@@ -669,3 +689,8 @@ config ZONE_DEVICE
 
 config FRAME_VECTOR
        bool
+
+config ARCH_USES_HIGH_VMA_FLAGS
+       bool
+config ARCH_HAS_PKEYS
+       bool