| author | Shuide Chen <shuide.chen@amlogic.com> | 2018-07-23 08:15:43 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-07-23 08:15:43 (GMT) |
| commit | 08fa0f536c4f51115fdfd18155f4204303f80c64 (patch) | |
| tree | 2537c03aae5bcdbc71356a6ed28c81799188fcb9 | |
| parent | 474ed44800b22dc48638fa6bfdf200e5972c745f (diff) | |
| parent | a93befcd81c072e4c0d0a80809a5906a3e9574e5 (diff) | |
| download | common-08fa0f536c4f51115fdfd18155f4204303f80c64.zip common-08fa0f536c4f51115fdfd18155f4204303f80c64.tar.gz common-08fa0f536c4f51115fdfd18155f4204303f80c64.tar.bz2 | |
Merge "defconfig: enable memory control groups" into p-amlogic
| -rw-r--r-- | arch/arm64/configs/meson64_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig index 4d6bfd3..632b8ba 100644 --- a/arch/arm64/configs/meson64_defconfig +++ b/arch/arm64/configs/meson64_defconfig @@ -18,6 +18,8 @@ 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 @@ -516,7 +518,6 @@ 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 |