Merge tag 'mm-stable-2023-04-27-15-30' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 5ca8fcfae243c2f0e40810af77efa444d3578973..7672a22647b4a2434c22bda7b92b3897efc84783 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -238,30 +238,8 @@ config SLUB
           and has enhanced diagnostics. SLUB is the default choice for
           a slab allocator.
 
-config SLOB_DEPRECATED
-       depends on EXPERT
-       bool "SLOB (Simple Allocator - DEPRECATED)"
-       depends on !PREEMPT_RT
-       help
-          Deprecated and scheduled for removal in a few cycles. SLUB
-          recommended as replacement. CONFIG_SLUB_TINY can be considered
-          on systems with 16MB or less RAM.
-
-          If you need SLOB to stay, please contact linux-mm@kvack.org and
-          people listed in the SLAB ALLOCATOR section of MAINTAINERS file,
-          with your use case.
-
-          SLOB replaces the stock allocator with a drastically simpler
-          allocator. SLOB is generally more space efficient but
-          does not perform as well on large systems.
-
 endchoice
 
-config SLOB
-       bool
-       default y
-       depends on SLOB_DEPRECATED
-
 config SLUB_TINY
        bool "Configure SLUB for minimal memory footprint"
        depends on SLUB && EXPERT
@@ -692,7 +670,6 @@ config BOUNCE
 
 config MMU_NOTIFIER
        bool
-       select SRCU
        select INTERVAL_TREE
 
 config KSM