From e85b291d7dd3cdfa4131cc3c0b4da3a4061b331e Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Wed, 23 Jun 2021 18:42:10 -0700 Subject: [PATCH] ANDROID: GKI: Enable CONFIG_MEMCG Enable CONFIG_MEMCG config to provide a way to use memory cgroups with GKI kernels. If not needed, memcgs can be disabled using "group_disable=memory" kernel command-line option. Bug: 191223209 Signed-off-by: Suren Baghdasaryan Change-Id: Ife5cfe17576d92ac116dabd1a118bc0bb013b26f --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index e1d96b946ad8..9e75fba692ad 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -15,6 +15,7 @@ CONFIG_IKHEADERS=y CONFIG_UCLAMP_TASK=y CONFIG_UCLAMP_BUCKETS_COUNT=20 CONFIG_CGROUPS=y +CONFIG_MEMCG=y CONFIG_BLK_CGROUP=y CONFIG_CGROUP_SCHED=y CONFIG_UCLAMP_TASK_GROUP=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 91998158ffac..c4f89cd04566 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -17,6 +17,7 @@ CONFIG_IKHEADERS=y CONFIG_UCLAMP_TASK=y CONFIG_UCLAMP_BUCKETS_COUNT=20 CONFIG_CGROUPS=y +CONFIG_MEMCG=y CONFIG_BLK_CGROUP=y CONFIG_CGROUP_SCHED=y CONFIG_UCLAMP_TASK_GROUP=y