File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -973,7 +973,7 @@ config MEMCG
973973
974974config MEMCG_KMEM
975975 bool
976- depends on MEMCG && !SLOB
976+ depends on MEMCG
977977 default y
978978
979979config BLK_CGROUP
Original file line number Diff line number Diff 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
1110CONFIG_SLUB=y
1211CONFIG_SLUB_TINY=y
Original file line number Diff line number Diff 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-
258241endchoice
259242
260- config SLOB
261- bool
262- default y
263- depends on SLOB_DEPRECATED
264-
265243config SLUB_TINY
266244 bool "Configure SLUB for minimal memory footprint"
267245 depends on SLUB && EXPERT
Original file line number Diff line number Diff 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.
2424KCOV_INSTRUMENT_slab_common.o := n
25- KCOV_INSTRUMENT_slob.o := n
2625KCOV_INSTRUMENT_slab.o := n
2726KCOV_INSTRUMENT_slub.o := n
2827KCOV_INSTRUMENT_page_alloc.o := n
@@ -81,7 +80,6 @@ obj-$(CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP) += hugetlb_vmemmap.o
8180obj-$(CONFIG_NUMA) += mempolicy.o
8281obj-$(CONFIG_SPARSEMEM) += sparse.o
8382obj-$(CONFIG_SPARSEMEM_VMEMMAP) += sparse-vmemmap.o
84- obj-$(CONFIG_SLOB) += slob.o
8583obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o
8684obj-$(CONFIG_KSM) += ksm.o
8785obj-$(CONFIG_PAGE_POISONING) += page_poison.o
You can’t perform that action at this time.
0 commit comments