The patch titled
Subject: mm: use alloc_flags to record if kswapd can wake -fix
has been removed from the -mm tree. Its filename was
mm-use-alloc_flags-to-record-if-kswapd-can-wake-fix.patch
This patch was dropped because it was folded into mm-use-alloc_flags-to-record-if-kswapd-can-wake.patch
------------------------------------------------------
From: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Subject: mm: use alloc_flags to record if kswapd can wake -fix
Vlastimil Babka correctly pointed out that the ALLOC_KSWAPD flag needs to
be applied in the !CONFIG_ZONE_DMA32 case. This is a fix for the mmotm
path mm-use-alloc_flags-to-record-if-kswapd-can-wake.patch
Link: http://lkml.kernel.org/r/20181126143503.GO23260@xxxxxxxxxxxxxxxxxxx
Signed-off-by: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Zi Yan <zi.yan@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
--- a/mm/page_alloc.c~mm-use-alloc_flags-to-record-if-kswapd-can-wake-fix
+++ a/mm/page_alloc.c
@@ -3268,7 +3268,6 @@ static bool zone_allows_reclaim(struct z
}
#endif /* CONFIG_NUMA */
-#ifdef CONFIG_ZONE_DMA32
/*
* The restriction on ZONE_DMA32 as being a suitable zone to use to avoid
* fragmentation is subtle. If the preferred zone was HIGHMEM then
@@ -3285,6 +3284,7 @@ alloc_flags_nofragment(struct zone *zone
if (gfp_mask & __GFP_KSWAPD_RECLAIM)
alloc_flags |= ALLOC_KSWAPD;
+#ifdef CONFIG_ZONE_DMA32
if (zone_idx(zone) != ZONE_NORMAL)
goto out;
@@ -3298,15 +3298,9 @@ alloc_flags_nofragment(struct zone *zone
goto out;
out:
+#endif /* CONFIG_ZONE_DMA32 */
return alloc_flags;
}
-#else
-static inline unsigned int
-alloc_flags_nofragment(struct zone *zone, gfp_t gfp_mask)
-{
- return 0;
-}
-#endif
/*
* get_page_from_freelist goes through the zonelist trying to allocate
_
Patches currently in -mm which might be from mgorman@xxxxxxxxxxxxxxxxxxx are
mm-page_alloc-spread-allocations-across-zones-before-introducing-fragmentation.patch
mm-move-zone-watermark-accesses-behind-an-accessor.patch
mm-use-alloc_flags-to-record-if-kswapd-can-wake.patch
mm-reclaim-small-amounts-of-memory-when-an-external-fragmentation-event-occurs.patch
