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

Merge branch 'slub-tiny-v1r6' into slab/for-next 

Merge my series [1] to deprecate the SLOB allocator.
- Renames CONFIG_SLOB to CONFIG_SLOB_DEPRECATED with deprecation notice.
- The recommended replacement is CONFIG_SLUB, optionally with the new
  CONFIG_SLUB_TINY tweaks for systems with 16MB or less RAM.
- Use cases that stopped working with CONFIG_SLUB_TINY instead of SLOB
  should be reported to linux-mm@kvack.org and slab maintainers,
  otherwise SLOB will be removed in few cycles.

[1] https://lore.kernel.org/all/20221121171202.22080-1-vbabka@suse.cz/
parents 61766652 149b6fa2

arch/arm/configs/clps711x_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ CONFIG_ARCH_EDB7211=y 
CONFIG_ARCH_P720T=y

CONFIG_AEABI=y

# CONFIG_COREDUMP is not set

CONFIG_SLOB=y

CONFIG_SLUB=y

CONFIG_SLUB_TINY=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

arch/arm/configs/collie_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ CONFIG_CMDLINE="noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1" 
CONFIG_FPE_NWFPE=y

CONFIG_PM=y

# CONFIG_SWAP is not set

CONFIG_SLOB=y

CONFIG_SLUB=y

CONFIG_SLUB_TINY=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

arch/arm/configs/multi_v4t_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ CONFIG_ARM_CLPS711X_CPUIDLE=y 
CONFIG_JUMP_LABEL=y

CONFIG_PARTITION_ADVANCED=y

# CONFIG_COREDUMP is not set

CONFIG_SLOB=y

CONFIG_SLUB=y

CONFIG_SLUB_TINY=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

arch/arm/configs/omap1_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_PARTITION_ADVANCED=y

CONFIG_BINFMT_MISC=y

# CONFIG_SWAP is not set

CONFIG_SLOB=y

CONFIG_SLUB=y

CONFIG_SLUB_TINY=y

# CONFIG_VM_EVENT_COUNTERS is not set

CONFIG_NET=y

CONFIG_PACKET=y

arch/arm/configs/pxa_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_LDM_PARTITION=y

CONFIG_CMDLINE_PARTITION=y

CONFIG_BINFMT_MISC=y

CONFIG_SLOB=y

CONFIG_SLUB=y

CONFIG_SLUB_TINY=y

# CONFIG_COMPACTION is not set

CONFIG_NET=y

CONFIG_PACKET=y