Revert "mm: page_alloc: exclude unreclaimable allocations from zone fairness policy"

This reverts commit 722171bb2181.  The NUMA behaviour of this patch is
less than ideal.  An alternative approch is to interleave allocations
only within local zones which is implemented in the next patch.

Cc: stable@vger.kernel.org
Signed-off-by: Mel Gorman <mgorman@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index f861d0257e90048096b6398dabc7a8ce9a0bed3c..580a5f075ed0ab6e3047351a8271b1f053e35774 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1920,8 +1920,7 @@ zonelist_scan:
                 * back to remote zones that do not partake in the
                 * fairness round-robin cycle of this zonelist.
                 */
-               if ((alloc_flags & ALLOC_WMARK_LOW) &&
-                   (gfp_mask & GFP_MOVABLE_MASK)) {
+               if (alloc_flags & ALLOC_WMARK_LOW) {
                        if (zone_page_state(zone, NR_ALLOC_BATCH) <= 0)
                                continue;
                        if (zone_reclaim_mode &&