summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorMel Gorman <mgorman@suse.de>2013-12-20 14:54:11 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-20 12:19:18 -0800
commit8798cee2f90292ca4ca84baccc757e4d06f8797f (patch)
treedaff1e7835347b15effb8df8956d8108fe97fc67 /mm
parentee53664bda169f519ce3c6a22d378f0b946c8178 (diff)
downloadop-kernel-dev-8798cee2f90292ca4ca84baccc757e4d06f8797f.zip
op-kernel-dev-8798cee2f90292ca4ca84baccc757e4d06f8797f.tar.gz
Revert "mm: page_alloc: exclude unreclaimable allocations from zone fairness policy"
This reverts commit 73f038b863df. 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>
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index f861d02..580a5f0 100644
--- 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 &&
OpenPOWER on IntegriCloud