Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba33ac8b authored by Karsten Tausche's avatar Karsten Tausche
Browse files

Adjust kernel configs for new low-memory killer

Android 11 and beyond on kernel 4.9 or newer can use a new low memory
killer, lmkd. On kernel side it requires support for pidfd and psi. Both
are backported to the android-4.9-q common kernel as well, which we have
merged in.

Disable the old memory killer and enable PSI to allow using the new LMK.

Issue: FP3-A11#63
Issue: FP3-A13#31
Change-Id: Ia257a011e7ad8d11933900714cdc5f5e19048db0
parent 3f9eccf5
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ CONFIG_TASKSTATS=y
# CONFIG_TASK_DELAY_ACCT is not set
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
# CONFIG_PSI is not set
CONFIG_PSI=y
# CONFIG_PSI_DEFAULT_DISABLED is not set

#
# RCU Subsystem
@@ -3727,9 +3728,7 @@ CONFIG_STAGING=y
# Android
#
CONFIG_ASHMEM=y
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
# CONFIG_ANDROID_LMK_NOTIFY_TRIGGER is not set
# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
CONFIG_ION=y
# CONFIG_ION_TEST is not set
# CONFIG_ION_DUMMY is not set
+3 −4
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
# CONFIG_PSI is not set
CONFIG_PSI=y
# CONFIG_PSI_DEFAULT_DISABLED is not set

#
# RCU Subsystem
@@ -3732,9 +3733,7 @@ CONFIG_STAGING=y
# Android
#
CONFIG_ASHMEM=y
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
# CONFIG_ANDROID_LMK_NOTIFY_TRIGGER is not set
# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
CONFIG_ION=y
# CONFIG_ION_TEST is not set
# CONFIG_ION_DUMMY is not set