summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2020-03-26 21:58:35 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2020-03-26 21:58:34 -0700
commita2864d557b2fc670dc01596d4fc184c7c2d063aa (patch)
treebd024e5811007845ef63ba286e411f6b3d5e3005
parent6aa80572375c0b938e99f7da9cd45a2887a1293c (diff)
parenta99886e77b364b77c4dd0dce8c5fa9e8e5f3e877 (diff)
Merge "android: lowmemorykiller: consider unevictable pages"
-rw-r--r--drivers/staging/android/lowmemorykiller.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 80070f67a895..ee4c11b4e164 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -294,6 +294,7 @@ static int lmk_vmpressure_notifier(struct notifier_block *nb,
if (pressure >= 95) {
other_file = global_page_state(NR_FILE_PAGES) + zcache_pages() -
global_page_state(NR_SHMEM) -
+ global_page_state(NR_UNEVICTABLE) -
total_swapcache_pages();
other_free = global_page_state(NR_FREE_PAGES);
@@ -307,6 +308,7 @@ static int lmk_vmpressure_notifier(struct notifier_block *nb,
other_file = global_page_state(NR_FILE_PAGES) + zcache_pages() -
global_page_state(NR_SHMEM) -
+ global_page_state(NR_UNEVICTABLE) -
total_swapcache_pages();
other_free = global_page_state(NR_FREE_PAGES);
@@ -319,6 +321,7 @@ static int lmk_vmpressure_notifier(struct notifier_block *nb,
} else if (atomic_read(&shift_adj)) {
other_file = global_page_state(NR_FILE_PAGES) + zcache_pages() -
global_page_state(NR_SHMEM) -
+ global_page_state(NR_UNEVICTABLE) -
total_swapcache_pages();
other_free = global_page_state(NR_FREE_PAGES);