Skip to content

Commit 7adc50b

Browse files
committed
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 <huangtao@rock-chips.com>
1 parent 1dd2b51 commit 7adc50b

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

arch/arm64/configs/rockchip_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ CONFIG_CGROUP_FREEZER=y
1313
CONFIG_CPUSETS=y
1414
CONFIG_CGROUP_CPUACCT=y
1515
CONFIG_CGROUP_SCHEDTUNE=y
16+
CONFIG_MEMCG=y
17+
CONFIG_MEMCG_SWAP=y
1618
CONFIG_CGROUP_SCHED=y
1719
CONFIG_RT_GROUP_SCHED=y
1820
CONFIG_NAMESPACES=y
@@ -693,7 +695,6 @@ CONFIG_STAGING=y
693695
CONFIG_INV_MPU_IIO=y
694696
CONFIG_ASHMEM=y
695697
CONFIG_ANDROID_TIMED_GPIO=y
696-
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
697698
CONFIG_SYNC=y
698699
CONFIG_SW_SYNC=y
699700
CONFIG_SW_SYNC_USER=y

0 commit comments

Comments
 (0)