From e20dd13883a17fcf390267115521acddbb06846a Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Wed, 2 Apr 2025 00:35:31 +0000 Subject: [PATCH] ANDROID: gki_defconfig: add CONFIG_CPUSETS_V1=y for x86 to match arm64 To allow devices that are still using cpusets v1 to continue working as expected, we need to enable CONFIG_CPUSETS_V1 in GKI as of the upstream commit 1abab1ba0775 ("cgroup/cpuset: guard cpuset-v1 code under CONFIG_CPUSETS_V1") until we migrate devices over to v2. aosp/3284215 added that config for arm64 but missed x86, which causes failures to mount cpuset v1 cgroup controller on Cuttlefish. Add the missing config. Bug: 401031513 Change-Id: Id82a91c4c35324978513d371dc20e5c41694c0dc Signed-off-by: Suren Baghdasaryan --- arch/x86/configs/gki_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 52c446fd6107..12ae8c900ca6 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -36,6 +36,7 @@ CONFIG_CGROUP_SCHED=y CONFIG_UCLAMP_TASK_GROUP=y CONFIG_CGROUP_FREEZER=y CONFIG_CPUSETS=y +CONFIG_CPUSETS_V1=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_BPF=y CONFIG_NAMESPACES=y