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

Commit c337d04e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "lowmemorykiller: Don't count reserve page twice"

parents d53f9a61 d73f05ce

drivers/staging/android/lowmemorykiller.c

+1 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <linux/mm.h>

#include <linux/oom.h>

#include <linux/sched.h>

#include <linux/swap.h>

#include <linux/rcupdate.h>

#include <linux/notifier.h>

#include <linux/mutex.h>
@@ -281,7 +280,7 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc) 
			return 0;

	}



	other_free = global_page_state(NR_FREE_PAGES) - totalreserve_pages;

	other_free = global_page_state(NR_FREE_PAGES);



	if (global_page_state(NR_SHMEM) + total_swapcache_pages() <

		global_page_state(NR_FILE_PAGES))