Skip to content

Commit c59cd50

Browse files
RISC-V: nommu_virt: Drop unused SLAB_MERGE_DEFAULT
Our nommu_virt_defconfig set SLOB=y and SLAB_MERGE_DEFAULT=n. As of eb52c0f ("mm: Make SLAB_MERGE_DEFAULT depend on SL[AU]B") it's no longer necessary to set the second, which appears to never have had any effect for SLOB=y anyway. This was suggested by savedefconfig. Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent 8da46c0 commit c59cd50

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

arch/riscv/configs/nommu_virt_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ CONFIG_EXPERT=y
2424
# CONFIG_VM_EVENT_COUNTERS is not set
2525
# CONFIG_COMPAT_BRK is not set
2626
CONFIG_SLOB=y
27-
# CONFIG_SLAB_MERGE_DEFAULT is not set
2827
# CONFIG_MMU is not set
2928
CONFIG_SOC_VIRT=y
3029
CONFIG_SMP=y

0 commit comments

Comments
 (0)