commit cf21247ea5584561f341334d885b6b9ac09c1669
author Robert Kolchmeyer <rkolchmeyer@google.com> Mon Aug 04 14:15:52 2025 -0700
committer Robert Kolchmeyer <rkolchmeyer@google.com> Tue Aug 05 09:59:21 2025 -0700
tree 713bc6f4b96b0799948edac5ff28c3b37e500b43
parent 70c1244899e1e2a412723048cd3fe1e71acaac48

lakitu_defconfig: set CONFIG_MEMCG_V1

The default 6.12 kernel configuration removed support for memcg v1.
Re-enable this option since we depend on it.

BUG=b/435446553
TEST=presubmit
RELEASE_NOTE=None

Change-Id: Ic0801ce046bf2db7d9265a84f250daebaf8b49c8
Signed-off-by: Robert Kolchmeyer <rkolchmeyer@google.com>
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/108440
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Kevin Berry <kpberry@google.com>

arch/arm64/configs/lakitu_defconfig

diff --git a/arch/arm64/configs/lakitu_defconfig b/arch/arm64/configs/lakitu_defconfig
index 2e1af33..ef2ff3a 100644
--- a/arch/arm64/configs/lakitu_defconfig
+++ b/arch/arm64/configs/lakitu_defconfig
@@ -172,7 +172,7 @@
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-# CONFIG_MEMCG_V1 is not set
+CONFIG_MEMCG_V1=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y

arch/x86/configs/lakitu_defconfig

diff --git a/arch/x86/configs/lakitu_defconfig b/arch/x86/configs/lakitu_defconfig
index c216ca6..5b53e84 100644
--- a/arch/x86/configs/lakitu_defconfig
+++ b/arch/x86/configs/lakitu_defconfig
@@ -193,7 +193,7 @@
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-# CONFIG_MEMCG_V1 is not set
+CONFIG_MEMCG_V1=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y