From: Palmer Dabbelt <palmer@rivosinc.com>
Date: Wed, 19 Jan 2022 18:39:37 +0000 (-0800)
Subject: RISC-V: nommu_virt: Drop unused SLAB_MERGE_DEFAULT
X-Git-Tag: v5.17-rc1~17^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c59cd507fb640c2acc6b07cb60d7f765839e18c7;p=tomoyo%2Ftomoyo-test1.git

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>
---

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