Skip to content

Commit c9929f0

Browse files
committed
mm/slob: remove CONFIG_SLOB
Remove SLOB from Kconfig and Makefile. Everything under #ifdef CONFIG_SLOB, and mm/slob.c is now dead code. Signed-off-by: Vlastimil Babka <vbabka@suse.cz> Acked-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Acked-by: Lorenzo Stoakes <lstoakes@gmail.com> Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>
1 parent eeac8ed commit c9929f0

4 files changed

Lines changed: 1 addition & 26 deletions

File tree

init/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -973,7 +973,7 @@ config MEMCG
973973

974974
config MEMCG_KMEM
975975
bool
976-
depends on MEMCG && !SLOB
976+
depends on MEMCG
977977
default y
978978

979979
config BLK_CGROUP

kernel/configs/tiny.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ CONFIG_KERNEL_XZ=y
77
# CONFIG_KERNEL_LZO is not set
88
# CONFIG_KERNEL_LZ4 is not set
99
# CONFIG_SLAB is not set
10-
# CONFIG_SLOB_DEPRECATED is not set
1110
CONFIG_SLUB=y
1211
CONFIG_SLUB_TINY=y

mm/Kconfig

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -238,30 +238,8 @@ config SLUB
238238
and has enhanced diagnostics. SLUB is the default choice for
239239
a slab allocator.
240240

241-
config SLOB_DEPRECATED
242-
depends on EXPERT
243-
bool "SLOB (Simple Allocator - DEPRECATED)"
244-
depends on !PREEMPT_RT
245-
help
246-
Deprecated and scheduled for removal in a few cycles. SLUB
247-
recommended as replacement. CONFIG_SLUB_TINY can be considered
248-
on systems with 16MB or less RAM.
249-
250-
If you need SLOB to stay, please contact linux-mm@kvack.org and
251-
people listed in the SLAB ALLOCATOR section of MAINTAINERS file,
252-
with your use case.
253-
254-
SLOB replaces the stock allocator with a drastically simpler
255-
allocator. SLOB is generally more space efficient but
256-
does not perform as well on large systems.
257-
258241
endchoice
259242

260-
config SLOB
261-
bool
262-
default y
263-
depends on SLOB_DEPRECATED
264-
265243
config SLUB_TINY
266244
bool "Configure SLUB for minimal memory footprint"
267245
depends on SLUB && EXPERT

mm/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ KCSAN_INSTRUMENT_BARRIERS := y
2222
# flaky coverage that is not a function of syscall inputs. E.g. slab is out of
2323
# free pages, or a task is migrated between nodes.
2424
KCOV_INSTRUMENT_slab_common.o := n
25-
KCOV_INSTRUMENT_slob.o := n
2625
KCOV_INSTRUMENT_slab.o := n
2726
KCOV_INSTRUMENT_slub.o := n
2827
KCOV_INSTRUMENT_page_alloc.o := n
@@ -81,7 +80,6 @@ obj-$(CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP) += hugetlb_vmemmap.o
8180
obj-$(CONFIG_NUMA) += mempolicy.o
8281
obj-$(CONFIG_SPARSEMEM) += sparse.o
8382
obj-$(CONFIG_SPARSEMEM_VMEMMAP) += sparse-vmemmap.o
84-
obj-$(CONFIG_SLOB) += slob.o
8583
obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o
8684
obj-$(CONFIG_KSM) += ksm.o
8785
obj-$(CONFIG_PAGE_POISONING) += page_poison.o

0 commit comments

Comments
 (0)