commit 5195cfd1ff43aa0de737e09e4536b96015e0cd42
author Martijn Coenen <maco@google.com> Thu Feb 25 10:36:47 2016 +0100
committer Martijn Coenen <maco@google.com> Thu Feb 25 09:49:52 2016 +0000
tree 390ef444adf42e9e5979a21cfaf6b7af341c4436
parent 4957abaa8ca1017091ca638a9eb5d9517cba9987

Revert "bullhead_defconfig: disable Android LMK, enable mem cgroups."

This reverts commit 0dbad758a5d0be5810cf8c50a85b3e6f887f4fca.

arch/arm64/configs/bullhead_defconfig

diff --git a/arch/arm64/configs/bullhead_defconfig b/arch/arm64/configs/bullhead_defconfig
index 052d27b..d2d544e 100644
--- a/arch/arm64/configs/bullhead_defconfig
+++ b/arch/arm64/configs/bullhead_defconfig
@@ -10,8 +10,6 @@
 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_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