summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2018-08-01 05:18:29 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2018-08-01 05:18:29 (GMT)
commitee8f97497deca342d26db6c138236a1a11b55b80 (patch)
tree58226eaf577e482bf9f7fe616fa12f92b00aa011
parenta93befcd81c072e4c0d0a80809a5906a3e9574e5 (diff)
downloadcommon-ee8f97497deca342d26db6c138236a1a11b55b80.zip
common-ee8f97497deca342d26db6c138236a1a11b55b80.tar.gz
common-ee8f97497deca342d26db6c138236a1a11b55b80.tar.bz2
Revert "defconfig: enable memory control groups"
This reverts commit a93befcd81c072e4c0d0a80809a5906a3e9574e5. Change-Id: Ia14c70b520b7e7dc188ea8936f4f3f92d9c30558
Diffstat
-rw-r--r--arch/arm64/configs/meson64_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig
index 781311e..bcec89f 100644
--- a/arch/arm64/configs/meson64_defconfig
+++ b/arch/arm64/configs/meson64_defconfig
@@ -18,8 +18,6 @@ CONFIG_CGROUP_CPUACCT=y
CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
CONFIG_CGROUP_BPF=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_KALLSYMS_ALL=y
CONFIG_BPF_SYSCALL=y
@@ -518,6 +516,7 @@ CONFIG_UIO_PDRV_GENIRQ=y
CONFIG_VIRTIO_MMIO=y
CONFIG_STAGING=y
CONFIG_ASHMEM=y
+CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_PM_DEVFREQ=y
CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
CONFIG_DEVFREQ_GOV_PERFORMANCE=y