From 919cc2ab499e7ea153a37171126cecb1487ed691 Mon Sep 17 00:00:00 2001 From: Jenna Date: Wed, 7 Aug 2024 11:50:47 +0200 Subject: [PATCH] defconfig: Enable Simple Low Memory Killer Change-Id: I6694b67c89c08e2521b054e3917a72fb6260f8df Signed-off-by: Sultan Alsawaf # Conflicts: # arch/arm64/configs/vendor/pixel_experience-a52q_defconfig # arch/arm64/configs/vendor/pixel_experience-a72q_defconfig --- .../vendor/pixel_experience-a52q_defconfig | 20 +++++++++---------- .../vendor/pixel_experience-a72q_defconfig | 20 +++++++++---------- drivers/block/zram/Kconfig | 4 ++-- drivers/staging/android/Kconfig | 4 ++-- 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/arch/arm64/configs/vendor/pixel_experience-a52q_defconfig b/arch/arm64/configs/vendor/pixel_experience-a52q_defconfig index 2b3e5a5a31cf..31ea6ae34e44 100755 --- a/arch/arm64/configs/vendor/pixel_experience-a52q_defconfig +++ b/arch/arm64/configs/vendor/pixel_experience-a52q_defconfig @@ -107,8 +107,9 @@ CONFIG_TASKSTATS=y # CONFIG_TASK_DELAY_ACCT is not set CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_PSI=y +# CONFIG_PSI is not set # CONFIG_PSI_DEFAULT_DISABLED is not set +CONFIG_ANDROID_SIMPLE_LMK=y # # RCU Subsystem @@ -144,10 +145,7 @@ CONFIG_PELT_UTIL_HALFLIFE_32=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y -CONFIG_MEMCG_SWAP_ENABLED=y -CONFIG_MEMCG_FORCE_USE_VM_SWAPPINESS=y +# CONFIG_MEMCG is not set CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set CONFIG_CGROUP_WRITEBACK=y @@ -1438,9 +1436,9 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_ZRAM=y # CONFIG_ZRAM_DEDUP is not set -CONFIG_ZRAM_WRITEBACK=y -CONFIG_ZRAM_LRU_WRITEBACK=y -CONFIG_ZRAM_LRU_WRITEBACK_LIMIT=1024 +# CONFIG_ZRAM_WRITEBACK is not set +# CONFIG_ZRAM_LRU_WRITEBACK is not set +# CONFIG_ZRAM_LRU_WRITEBACK_LIMIT is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set @@ -4739,10 +4737,10 @@ CONFIG_STAGING=y # CONFIG_ASHMEM=y # CONFIG_ANDROID_VSOC is not set -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y +# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set +# CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES is not set # CONFIG_SAMSUNG_FREECESS is not set -CONFIG_SAMSUNG_LMKD_DEBUG=y +# CONFIG_SAMSUNG_LMKD_DEBUG is not set CONFIG_ION=y # CONFIG_ION_SYSTEM_HEAP is not set # CONFIG_ION_CARVEOUT_HEAP is not set diff --git a/arch/arm64/configs/vendor/pixel_experience-a72q_defconfig b/arch/arm64/configs/vendor/pixel_experience-a72q_defconfig index 1b03b50b6a24..900a070b659f 100644 --- a/arch/arm64/configs/vendor/pixel_experience-a72q_defconfig +++ b/arch/arm64/configs/vendor/pixel_experience-a72q_defconfig @@ -107,8 +107,9 @@ CONFIG_TASKSTATS=y # CONFIG_TASK_DELAY_ACCT is not set CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_PSI=y +# CONFIG_PSI is not set # CONFIG_PSI_DEFAULT_DISABLED is not set +CONFIG_ANDROID_SIMPLE_LMK=y # # RCU Subsystem @@ -144,10 +145,7 @@ CONFIG_PELT_UTIL_HALFLIFE_32=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y -CONFIG_MEMCG_SWAP_ENABLED=y -CONFIG_MEMCG_FORCE_USE_VM_SWAPPINESS=y +# CONFIG_MEMCG is not set CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set CONFIG_CGROUP_WRITEBACK=y @@ -1435,9 +1433,9 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_ZRAM=y # CONFIG_ZRAM_DEDUP is not set -CONFIG_ZRAM_WRITEBACK=y -CONFIG_ZRAM_LRU_WRITEBACK=y -CONFIG_ZRAM_LRU_WRITEBACK_LIMIT=1024 +# CONFIG_ZRAM_WRITEBACK is not set +# CONFIG_ZRAM_LRU_WRITEBACK is not set +# CONFIG_ZRAM_LRU_WRITEBACK_LIMIT is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set @@ -4736,10 +4734,10 @@ CONFIG_STAGING=y # CONFIG_ASHMEM=y # CONFIG_ANDROID_VSOC is not set -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y +# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set +# CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES is not set # CONFIG_SAMSUNG_FREECESS is not set -CONFIG_SAMSUNG_LMKD_DEBUG=y +# CONFIG_SAMSUNG_LMKD_DEBUG is not set CONFIG_ION=y # CONFIG_ION_SYSTEM_HEAP is not set # CONFIG_ION_CARVEOUT_HEAP is not set diff --git a/drivers/block/zram/Kconfig b/drivers/block/zram/Kconfig index 8ed15472c1fe..57f1ccec12fb 100755 --- a/drivers/block/zram/Kconfig +++ b/drivers/block/zram/Kconfig @@ -32,7 +32,7 @@ config ZRAM_DEDUP config ZRAM_WRITEBACK bool "Write back incompressible or idle page to backing device" depends on ZRAM - default y + default n help With incompressible page, there is no memory saving to keep it in memory. Instead, write it out to backing device. @@ -57,7 +57,7 @@ config ZRAM_MEMORY_TRACKING config ZRAM_LRU_WRITEBACK bool depends on ZRAM_WRITEBACK - default y + default n help This feature supports zram lru-based writeback (SQZR). diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig index d2571960ee82..5e903d668729 100755 --- a/drivers/staging/android/Kconfig +++ b/drivers/staging/android/Kconfig @@ -37,7 +37,7 @@ config ANDROID_LOW_MEMORY_KILLER config ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES bool "Android Low Memory Killer: detect oom_adj values" depends on ANDROID_LOW_MEMORY_KILLER - default y + default n ---help--- Detect oom_adj values written to /sys/module/lowmemorykiller/parameters/adj and convert them @@ -51,7 +51,7 @@ config SAMSUNG_FREECESS config SAMSUNG_LMKD_DEBUG bool "record lmkd kill history" - default y + default n help record lmkd kill history