Skip to content

Commit

Permalink
RISC-V: nommu_virt: Drop unused SLAB_MERGE_DEFAULT
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Palmer Dabbelt committed Jan 20, 2022
1 parent 8da46c0 commit c59cd50
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion arch/riscv/configs/nommu_virt_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ CONFIG_EXPERT=y
# CONFIG_VM_EVENT_COUNTERS is not set
# CONFIG_COMPAT_BRK is not set
CONFIG_SLOB=y
# CONFIG_SLAB_MERGE_DEFAULT is not set
# CONFIG_MMU is not set
CONFIG_SOC_VIRT=y
CONFIG_SMP=y
Expand Down

0 comments on commit c59cd50

Please sign in to comment.