From b1e2fc4438f909ba02a770928072e8598771e386 Mon Sep 17 00:00:00 2001 From: Martijn Coenen <maco@google.com> Date: Thu, 25 Feb 2016 10:38:49 +0100 Subject: [PATCH] Revert "angler_defconfig: disable Android LMK, enable mem cgroups." This reverts commit 21daa989de4d82e85c3ae543662f68c086eb54aa. --- arch/arm64/configs/angler_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/configs/angler_defconfig b/arch/arm64/configs/angler_defconfig index 88071eb6da2d..40c7487a281e 100644 --- a/arch/arm64/configs/angler_defconfig +++ b/arch/arm64/configs/angler_defconfig @@ -10,8 +10,6 @@ CONFIG_CGROUP_FREEZER=y CONFIG_CPUSETS=y CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_CGROUP_SCHED=y CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y @@ -524,6 +522,7 @@ CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y CONFIG_ASHMEM=y CONFIG_ANDROID_LOGGER=y +CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_ANDROID_INTF_ALARM_DEV=y CONFIG_ONESHOT_SYNC=y CONFIG_ION=y -- GitLab