From 674ef2f896ce3b7d6476762b7c8600e2628dbae6 Mon Sep 17 00:00:00 2001 From: Guo Ren Date: Mon, 29 Jul 2024 06:03:27 -0400 Subject: [PATCH] configs: Remove CONFIG_CGROUP=n from 32-bit.config & 64ilp32.config 32-bit.config & 64ilp32.config only contain ABI differences. Fixes: 3c36297c8b0a ("Revert ci: Disable CGROUP for all defconfig") Signed-off-by: Guo Ren --- arch/riscv/configs/32-bit.config | 1 - arch/riscv/configs/64ilp32.config | 1 - arch/riscv/configs/k230_defconfig | 3 ++- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/riscv/configs/32-bit.config b/arch/riscv/configs/32-bit.config index 597dfa4756b3c..16ee163847b44 100644 --- a/arch/riscv/configs/32-bit.config +++ b/arch/riscv/configs/32-bit.config @@ -3,4 +3,3 @@ CONFIG_ARCH_RV32I=y CONFIG_32BIT=y # CONFIG_PORTABLE is not set CONFIG_NONPORTABLE=y -CONFIG_CGROUPS=n diff --git a/arch/riscv/configs/64ilp32.config b/arch/riscv/configs/64ilp32.config index 98d729242afb0..18f9749dbf451 100644 --- a/arch/riscv/configs/64ilp32.config +++ b/arch/riscv/configs/64ilp32.config @@ -3,4 +3,3 @@ CONFIG_ARCH_RV64ILP32=y CONFIG_32BIT=y # CONFIG_PORTABLE is not set CONFIG_NONPORTABLE=y -CONFIG_CGROUPS=n diff --git a/arch/riscv/configs/k230_defconfig b/arch/riscv/configs/k230_defconfig index 2040d2b2d0837..edddd5b833715 100644 --- a/arch/riscv/configs/k230_defconfig +++ b/arch/riscv/configs/k230_defconfig @@ -6,7 +6,8 @@ CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -CONFIG_CGROUPS=y +CONFIG_CGROUPS=n +CONFIG_NONPORTABLE=y CONFIG_MEMCG=y CONFIG_CGROUP_SCHED=y CONFIG_CFS_BANDWIDTH=y