summaryrefslogtreecommitdiff
path: root/arch/riscv/configs
diff options
context:
space:
mode:
authorPalmer Dabbelt <palmer@rivosinc.com>2022-01-19 21:39:37 +0300
committerPalmer Dabbelt <palmer@rivosinc.com>2022-01-20 23:48:14 +0300
commitc59cd507fb640c2acc6b07cb60d7f765839e18c7 (patch)
treef7df29a923356cfce12acfc97fa612dae1efd8d3 /arch/riscv/configs
parent8da46c0f98a1a17bc8f6d324d82b4d26e1448869 (diff)
downloadlinux-c59cd507fb640c2acc6b07cb60d7f765839e18c7.tar.xz
RISC-V: nommu_virt: Drop unused SLAB_MERGE_DEFAULT
Our nommu_virt_defconfig set SLOB=y and SLAB_MERGE_DEFAULT=n. As of eb52c0fc2331 ("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>
Diffstat (limited to 'arch/riscv/configs')
-rw-r--r--arch/riscv/configs/nommu_virt_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/riscv/configs/nommu_virt_defconfig b/arch/riscv/configs/nommu_virt_defconfig
index 5f078156dfcd..e1c9864b6237 100644
--- a/arch/riscv/configs/nommu_virt_defconfig
+++ b/arch/riscv/configs/nommu_virt_defconfig
@@ -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