From aa9752dec8d8d95c0872f26c9c1935c410a8f1b8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 8 Aug 2020 13:51:17 +0200 Subject: [PATCH] ANDROID: mm: fix up removal of vm_total_pages problem commit 92501cb6702a ("ANDROID: add extra free kbytes tunable") added a use of the vm_total_pages variable, which is now gone upstream. So fix this up with a call to nr_free_zone_pages(gfp_zone(GFP_HIGHUSER_MOVABLE) instead, which I _think_ is the equivalent value. Hopefully :) Bug: 86445363 Bug: 109664768 Bug: 120445732 Cc: Rik van Riel Cc: Colin Cross Cc: Suren Baghdasaryan Signed-off-by: Greg Kroah-Hartman Change-Id: I78d4a0877fd2fc449e663e0f4aa047b1b21d4d2b --- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 68e555dbe514..9aa32db3e60b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -7789,7 +7789,7 @@ static void __setup_per_zone_wmarks(void) tmp = (u64)pages_min * zone_managed_pages(zone); do_div(tmp, lowmem_pages); low = (u64)pages_low * zone_managed_pages(zone); - do_div(low, vm_total_pages); + do_div(low, nr_free_zone_pages(gfp_zone(GFP_HIGHUSER_MOVABLE))); if (is_highmem(zone)) { /* * __GFP_HIGH and PF_MEMALLOC allocations usually don't