staging: comedi: dt2811: rename 'boardtypes'

[cascardo/linux.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index b0432b7..3e2daef 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -404,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.


@@ -567,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.


@@ -576,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


@@ -637,7 +648,8 @@ config DEFERRED_STRUCT_PAGE_INIT
        bool "Defer initialisation of struct pages to kthreads"
        default n
        depends on ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
        bool "Defer initialisation of struct pages to kthreads"
        default n
        depends on ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT

-       depends on MEMORY_HOTPLUG
+       depends on NO_BOOTMEM && MEMORY_HOTPLUG
+       depends on !FLATMEM

        help
          Ordinarily all struct pages are initialised during early boot in a
          single thread. On very large machines this can take a considerable
        help
          Ordinarily all struct pages are initialised during early boot in a
          single thread. On very large machines this can take a considerable