[folded-merged] page_alloc-consider-highatomic-reserve-in-watermark-fast-v5.patch removed from -mm tree

[folded-merged] page_alloc-consider-highatomic-reserve-in-watermark-fast-v5.patch removed from -mm tree

[akpm]

The patch titled
     Subject: page_alloc-consider-highatomic-reserve-in-watermark-fast-v5
has been removed from the -mm tree.  Its filename was
     page_alloc-consider-highatomic-reserve-in-watermark-fast-v5.patch

This patch was dropped because it was folded into page_alloc-consider-highatomic-reserve-in-watermark-fast.patch

------------------------------------------------------
From: Jaewon Kim <jaewon31.kim@samsung.com>
Subject: page_alloc-consider-highatomic-reserve-in-watermark-fast-v5

remove redundant code for high-order

Link: http://lkml.kernel.org/r/20200623035242.27232-1-jaewon31.kim@samsung.com
Reported-by: Yong-Taek Lee <ytk.lee@samsung.com>
Suggested-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Jaewon Kim <jaewon31.kim@samsung.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: Baoquan He <bhe@redhat.com>
Acked-by: Mel Gorman <mgorman@techsingularity.net>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/page_alloc.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/mm/page_alloc.c~page_alloc-consider-highatomic-reserve-in-watermark-fast-v5
+++ a/mm/page_alloc.c
@@ -3591,18 +3591,18 @@ static inline bool zone_watermark_fast(s
 				unsigned int alloc_flags)
 {
 	long free_pages;
-	long unusable_free;
 
 	free_pages = zone_page_state(z, NR_FREE_PAGES);
-	unusable_free = __zone_watermark_unusable_free(z, order, alloc_flags);
 
 	/*
 	 * Fast check for order-0 only. If this fails then the reserves
 	 * need to be calculated.
 	 */
 	if (!order) {
-		long fast_free = free_pages - unusable_free;
+		long fast_free;
 
+		fast_free = free_pages;
+		fast_free -= __zone_watermark_unusable_free(z, 0, alloc_flags);
 		if (fast_free > mark + z->lowmem_reserve[highest_zoneidx])
 			return true;
 	}
_

Patches currently in -mm which might be from jaewon31.kim@samsung.com are

page_alloc-consider-highatomic-reserve-in-watermark-fast.patch