diff options
| author | Mister Oyster <oysterized@gmail.com> | 2017-05-28 12:53:07 +0200 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-05-28 12:53:07 +0200 |
| commit | 0cf7477e492f574470607c6326431f70518cd2c6 (patch) | |
| tree | 5326fe1e5962e654fa66700370d1a29fe5308d4a | |
| parent | d0abb64efc2a0e77fb76aa2014058a3a6b528508 (diff) | |
Revert "defconfig: kill LMK and enable MEMCG"
This reverts commit eccc87176fd5865301cc59e5f6987449f22a4489.
| -rw-r--r-- | arch/arm64/configs/m2note_defconfig | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm64/configs/m2note_defconfig b/arch/arm64/configs/m2note_defconfig index 6a20fa0b8..9a146764f 100644 --- a/arch/arm64/configs/m2note_defconfig +++ b/arch/arm64/configs/m2note_defconfig @@ -109,9 +109,7 @@ CONFIG_CGROUPS=y # CONFIG_CPUSETS is not set CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -CONFIG_MEMCG=y -# CONFIG_MEMCG_SWAP is not set -# 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 @@ -123,7 +121,6 @@ CONFIG_RT_GROUP_SCHED=y CONFIG_UIDGID_CONVERTED=y # CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set # CONFIG_SCHED_AUTOGROUP is not set -CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y @@ -2689,7 +2686,9 @@ CONFIG_STAGING=y CONFIG_ANDROID=y CONFIG_ASHMEM=y CONFIG_ANDROID_TIMED_OUTPUT=y -# 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_ANDROID_LMK_ADJ_RBTREE=y CONFIG_ANDROID_INTF_ALARM_DEV=y CONFIG_SYNC=y CONFIG_SW_SYNC=y |