From 3a32df5d03a9a405fc9782ac31de7a5d6723062d Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Tue, 9 Jan 2018 15:02:58 -0800 Subject: [PATCH] ARM64: configs: nokia: Disable kernel lowmemorykiller driver Disable kernel lowmemorykiller driver and enable memcg as part of migration to userspace lowmemorykiller. Bug: 63631020 Change-Id: I96bfd9fffe1bf1a310c3c5a1499571afa0d93936 Signed-off-by: Suren Baghdasaryan --- arch/arm64/configs/nokia_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm64/configs/nokia_defconfig b/arch/arm64/configs/nokia_defconfig index ee4eff516d4c..9d2647cd3444 100644 --- a/arch/arm64/configs/nokia_defconfig +++ b/arch/arm64/configs/nokia_defconfig @@ -144,7 +144,8 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_SCHEDTUNE=y -# CONFIG_MEMCG is not set +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -4103,8 +4104,6 @@ CONFIG_STAGING=y CONFIG_ASHMEM=y CONFIG_ANDROID_TIMED_OUTPUT=y CONFIG_ANDROID_TIMED_GPIO=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y CONFIG_SYNC=y CONFIG_SW_SYNC=y # CONFIG_SW_SYNC_USER is not set