Commit c9929f0e authored by Vlastimil Babka's avatar Vlastimil Babka
Browse files

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: default avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarHyeonggon Yoo <42.hyeyoo@gmail.com>
Acked-by: default avatarLorenzo Stoakes <lstoakes@gmail.com>
Acked-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
parent eeac8ede

init/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -973,7 +973,7 @@ config MEMCG 


config MEMCG_KMEM

	bool

	depends on MEMCG && !SLOB

	depends on MEMCG

	default y



config BLK_CGROUP

kernel/configs/tiny.config

+0 −1
Original line number Diff line number Diff line
@@ -7,6 +7,5 @@ CONFIG_KERNEL_XZ=y 
# CONFIG_KERNEL_LZO is not set

# CONFIG_KERNEL_LZ4 is not set

# CONFIG_SLAB is not set

# CONFIG_SLOB_DEPRECATED is not set

CONFIG_SLUB=y

CONFIG_SLUB_TINY=y

mm/Kconfig

+0 −22
Original line number Diff line number Diff line
@@ -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

mm/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ KCSAN_INSTRUMENT_BARRIERS := y 
# flaky coverage that is not a function of syscall inputs. E.g. slab is out of

# free pages, or a task is migrated between nodes.

KCOV_INSTRUMENT_slab_common.o := n

KCOV_INSTRUMENT_slob.o := n

KCOV_INSTRUMENT_slab.o := n

KCOV_INSTRUMENT_slub.o := n

KCOV_INSTRUMENT_page_alloc.o := n
@@ -81,7 +80,6 @@ obj-$(CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP) += hugetlb_vmemmap.o 
obj-$(CONFIG_NUMA) 	+= mempolicy.o

obj-$(CONFIG_SPARSEMEM)	+= sparse.o

obj-$(CONFIG_SPARSEMEM_VMEMMAP) += sparse-vmemmap.o

obj-$(CONFIG_SLOB) += slob.o

obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o

obj-$(CONFIG_KSM) += ksm.o

obj-$(CONFIG_PAGE_POISONING) += page_poison.o