Merge tag 'kbuild-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[thirdparty/linux.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 4914eb3216fccec7bf352a67c3f9d1e9ad17acf0..b1448aa81e15f48d7a2c14d18b666485635f2df1 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -45,22 +45,6 @@ config ZSWAP_DEFAULT_ON
          The selection made here can be overridden by using the kernel
          command line 'zswap.enabled=' option.
 
-config ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON
-       bool "Invalidate zswap entries when pages are loaded"
-       depends on ZSWAP
-       help
-         If selected, exclusive loads for zswap will be enabled at boot,
-         otherwise it will be disabled.
-
-         If exclusive loads are enabled, when a page is loaded from zswap,
-         the zswap entry is invalidated at once, as opposed to leaving it
-         in zswap until the swap entry is freed.
-
-         This avoids having two copies of the same page in memory
-         (compressed and uncompressed) after faulting in a page from zswap.
-         The cost is that if the page was never dirtied and needs to be
-         swapped out again, it will be re-compressed.
-
 config ZSWAP_SHRINKER_DEFAULT_ON
        bool "Shrink the zswap pool on memory pressure"
        depends on ZSWAP
@@ -900,15 +884,6 @@ config CMA
 
          If unsure, say "n".
 
-config CMA_DEBUG
-       bool "CMA debug messages (DEVELOPMENT)"
-       depends on DEBUG_KERNEL && CMA
-       help
-         Turns on debug messages in CMA.  This produces KERN_DEBUG
-         messages for every CMA call as well as various messages while
-         processing calls such as dma_alloc_from_contiguous().
-         This option does not affect warning and error messages.
-
 config CMA_DEBUGFS
        bool "CMA debugfs interface"
        depends on CMA && DEBUG_FS
@@ -925,14 +900,14 @@ config CMA_SYSFS
 config CMA_AREAS
        int "Maximum count of the CMA areas"
        depends on CMA
-       default 19 if NUMA
-       default 7
+       default 20 if NUMA
+       default 8
        help
          CMA allows to create CMA areas for particular purpose, mainly,
          used as device private area. This parameter sets the maximum
          number of CMA area in the system.
 
-         If unsure, leave the default value "7" in UMA and "19" in NUMA.
+         If unsure, leave the default value "8" in UMA and "20" in NUMA.
 
 config MEM_SOFT_DIRTY
        bool "Track memory changes"
@@ -997,6 +972,12 @@ config IDLE_PAGE_TRACKING
          See Documentation/admin-guide/mm/idle_page_tracking.rst for
          more details.
 
+# Architectures which implement cpu_dcache_is_aliasing() to query
+# whether the data caches are aliased (VIVT or VIPT with dcache
+# aliasing) need to select this.
+config ARCH_HAS_CPU_CACHE_ALIASING
+       bool
+
 config ARCH_HAS_CACHE_LINE_SIZE
        bool