Merge tag 'net-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[platform/kernel/linux-starfive.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 5c5dcbd..57e1d8c 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -573,6 +573,12 @@ config COMPACTION
          it and then we would be really interested to hear about that at
          linux-mm@kvack.org.
 
+config COMPACT_UNEVICTABLE_DEFAULT
+       int
+       depends on COMPACTION
+       default 0 if PREEMPT_RT
+       default 1
+
 #
 # support for free page reporting
 config PAGE_REPORTING
@@ -1125,7 +1131,14 @@ config LRU_GEN
        # make sure folio->flags has enough spare bits
        depends on 64BIT || !SPARSEMEM || SPARSEMEM_VMEMMAP
        help
-         A high performance LRU implementation to overcommit memory.
+         A high performance LRU implementation to overcommit memory. See
+         Documentation/admin-guide/mm/multigen_lru.rst for details.
+
+config LRU_GEN_ENABLED
+       bool "Enable by default"
+       depends on LRU_GEN
+       help
+         This option enables the multi-gen LRU by default.
 
 config LRU_GEN_STATS
        bool "Full stats for debugging"