diff options
| author | Julian Veit <claymore1298@gmail.com> | 2020-12-11 03:41:00 +0100 |
|---|---|---|
| committer | Julian Veit <claymore1298@gmail.com> | 2020-12-11 03:41:04 +0100 |
| commit | 8054c97d620b31877be9669599d483bcfecc6d68 (patch) | |
| tree | 0a3a98417f1c4601d4f5354c8b7b802d54e3bf57 | |
| parent | a0eff126945eb3ad57de23026883dc28cf8c39be (diff) | |
Revert "hima: defconfig: Enable MEMCG and disable LOW_MEMORY_KILLER"r11.1
This reverts commit 1edf439c17bea24c8c64c1cf2a91ae43c3e84d0d.
Change-Id: I7713e2d0547b4e003f4529a6157a35d66f5fe43a
| -rw-r--r-- | arch/arm64/configs/hima_defconfig | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm64/configs/hima_defconfig b/arch/arm64/configs/hima_defconfig index 1c068cb0afa..6bf35416dac 100644 --- a/arch/arm64/configs/hima_defconfig +++ b/arch/arm64/configs/hima_defconfig @@ -113,10 +113,7 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y -CONFIG_MEMCG_SWAP_ENABLED=y -# CONFIG_MEMCG_KMEM is not set +# CONFIG_MEMCG is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -3546,7 +3543,8 @@ CONFIG_ASHMEM=y # CONFIG_ANDROID_LOGGER is not set CONFIG_ANDROID_TIMED_OUTPUT=y # CONFIG_ANDROID_TIMED_GPIO is not set -# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set +CONFIG_ANDROID_LOW_MEMORY_KILLER=y +CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y CONFIG_SYNC=y CONFIG_SW_SYNC=y # CONFIG_SW_SYNC_USER is not set |