Merge tag 'cxl-for-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl

[linux-2.6-microblaze.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index a5b4fee..0331f14 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -33,7 +33,7 @@ config ZSWAP
          pages that are in the process of being swapped out and attempts to
          compress them into a dynamically allocated RAM-based memory pool.
          This can result in a significant I/O reduction on swap device and,
-         in the case where decompressing from RAM is faster that swap device
+         in the case where decompressing from RAM is faster than swap device
          reads, can also improve workload performance.
 
          This is marked experimental because it is a new feature (as of
@@ -639,14 +639,6 @@ config BOUNCE
          memory available to the CPU. Enabled by default when HIGHMEM is
          selected, but you may say n to override this.
 
-config VIRT_TO_BUS
-       bool
-       help
-         An architecture should select this if it implements the
-         deprecated interface virt_to_bus().  All new architectures
-         should probably not select this.
-
-
 config MMU_NOTIFIER
        bool
        select SRCU
@@ -663,7 +655,7 @@ config KSM
          the many instances by a single page with that content, so
          saving memory until one or another app needs to modify the content.
          Recommended for use with KVM, or with other duplicative applications.
-         See Documentation/vm/ksm.rst for more information: KSM is inactive
+         See Documentation/mm/ksm.rst for more information: KSM is inactive
          until a program has madvised that an area is MADV_MERGEABLE, and
          root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
 
@@ -951,9 +943,6 @@ config ARCH_HAS_CURRENT_STACK_POINTER
          register alias named "current_stack_pointer", this config can be
          selected.
 
-config ARCH_HAS_VM_GET_PAGE_PROT
-       bool
-
 config ARCH_HAS_PTE_DEVMAP
        bool