From: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Date: Sat, 25 Dec 2021 06:09:21 +0000 (+0000)
Subject: mm: Make SLAB_MERGE_DEFAULT depend on SL[AU]B
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=eb52c0fc2331f8ad1f5f9fd79ba9ce90681ed50b;p=linux.git

mm: Make SLAB_MERGE_DEFAULT depend on SL[AU]B

SLOB always manage objects of different caches in same page regardless of
SLAB_MERGE_DEFAULT. Because it has no effect on SLOB, make it depend on
SLAB || SLUB.

Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Link: https://lore.kernel.org/r/20211225060921.13584-1-42.hyeyoo@gmail.com
---

diff --git a/init/Kconfig b/init/Kconfig
index 4b7bac10c72d3..03e1b863f5ce1 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1933,6 +1933,7 @@ endchoice
 config SLAB_MERGE_DEFAULT
 	bool "Allow slab caches to be merged"
 	default y
+	depends on SLAB || SLUB
 	help
 	  For reduced kernel memory fragmentation, slab caches can be
 	  merged when they share the same size and other characteristics.