From 7adc50bef2c77d9caad22ae52beed521e885df18 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 9 Feb 2018 18:09:19 +0800 Subject: [PATCH] arm64: rockchip_defconfig: remove CONFIG_ANDROID_LOW_MEMORY_KILLER e8f5f841b764 ("remove CONFIG_ANDROID_LOW_MEMORY_KILLER requirement") Kernel configuration options should include either CONFIG_ANDROID_LOW_MEMORY_KILLER for in-kernel lowmemorykiller driver to be used or a combination of CONFIG_MEMCG and CONFIG_MEMCG_SWAP if userspace lmkd is preferred. It is not currently possible to express this logical requirement in the config fragment so the CONFIG_ANDROID_LOW_MEMORY_KILLER requirement is simply removed for now. Change-Id: I69b9682029a50f4579f3ba11e6a9a497c5a51c28 Signed-off-by: Tao Huang --- arch/arm64/configs/rockchip_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig index 406dc58c712f..af02def3d32d 100644 --- a/arch/arm64/configs/rockchip_defconfig +++ b/arch/arm64/configs/rockchip_defconfig @@ -13,6 +13,8 @@ CONFIG_CGROUP_FREEZER=y CONFIG_CPUSETS=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_SCHEDTUNE=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y CONFIG_CGROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y CONFIG_NAMESPACES=y @@ -693,7 +695,6 @@ CONFIG_STAGING=y CONFIG_INV_MPU_IIO=y CONFIG_ASHMEM=y CONFIG_ANDROID_TIMED_GPIO=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_SYNC=y CONFIG_SW_SYNC=y CONFIG_SW_SYNC_USER=y