A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "mm: set the watermark_boost before updating the low and high wmarks"

Browse source
This commit is contained in:
qctecmdr 2020-02-12 05:13:22 -08:00 • committed by Gerrit - the friendly Code Review server
commit 378eb426d0
4 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/arm64/configs/vendor/lahaina_QGKI.config vendored
View file

@ -115,3 +115,4 @@ CONFIG_CRYPTO_DEV_QCRYPTO=y
CONFIG_CRYPTO_DEV_QCEDEV=y
CONFIG_THERMAL_TSENS=y
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
CONFIG_HAVE_USERSPACE_LOW_MEMORY_KILLER=y

2
arch/arm64/configs/vendor/lahaina_debug.config vendored
View file

@ -47,3 +47,5 @@ CONFIG_SLIMBUS_MSM_NGD=y
CONFIG_QCOM_SMCINVOKE=y
CONFIG_MSM_DEBUGCC_LAHAINA=y
CONFIG_QRTR_MHI=y
CONFIG_DEBUG_PANIC_ON_OOM=y
# CONFIG_USB_F_FS_IPC_LOGGING is not set

6
mm/oom_kill.c
View file

@ -56,7 +56,7 @@ int sysctl_panic_on_oom =
IS_ENABLED(CONFIG_DEBUG_PANIC_ON_OOM) ? 2 : 0;
int sysctl_oom_kill_allocating_task;
int sysctl_oom_dump_tasks = 1;
int sysctl_reap_mem_on_sigkill;
int sysctl_reap_mem_on_sigkill = 1;
/*
* Serializes oom killer invocations (out_of_memory()) from all contexts to
@ -1177,6 +1177,10 @@ void pagefault_out_of_memory(void)
.order = 0,
};
if (IS_ENABLED(CONFIG_HAVE_LOW_MEMORY_KILLER) ||
IS_ENABLED(CONFIG_HAVE_USERSPACE_LOW_MEMORY_KILLER))
return;
if (mem_cgroup_oom_synchronize(true))
return;

2
mm/page_alloc.c
View file

@ -7896,11 +7896,11 @@ static void __setup_per_zone_wmarks(void)
mult_frac(zone_managed_pages(zone),
watermark_scale_factor, 10000));
zone->watermark_boost = 0;
zone->_watermark[WMARK_LOW] = min_wmark_pages(zone) +
low + tmp;
zone->_watermark[WMARK_HIGH] = min_wmark_pages(zone) +
low + tmp * 2;
zone->watermark_boost = 0;
spin_unlock_irqrestore(&zone->lock, flags);
}