From a7ec6be56e1de80013391fe9a96f4966b0c7f9f4 Mon Sep 17 00:00:00 2001
From: Mel Gorman <mgorman@suse.de>
Date: Tue, 31 Jul 2012 16:44:12 -0700
Subject: [PATCH] --- yaml --- r: 320823 b: refs/heads/master c:
 183f6371aac2a5496a8ef2b0b0a68562652c3cdb h: refs/heads/master i:   320821:
 943c9432a4730e125bb35a5ee96077be681accb3   320819:
 bcc253636e4e66d1b953ef11d8b33d2bf393536b   320815:
 f32dc24a9e59d27060480b5b9c878ab125705e46 v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index afed3ba42c2d..58ec10e3d951 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfd19c5a9ecf8e5e38de2603077c4330af21316e
+refs/heads/master: 183f6371aac2a5496a8ef2b0b0a68562652c3cdb
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index f9d925451bfd..ef2d1e72fc07 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -2378,6 +2378,13 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
 
 	/* Allocate without watermarks if the context allows */
 	if (alloc_flags & ALLOC_NO_WATERMARKS) {
+		/*
+		 * Ignore mempolicies if ALLOC_NO_WATERMARKS on the grounds
+		 * the allocation is high priority and these type of
+		 * allocations are system rather than user orientated
+		 */
+		zonelist = node_zonelist(numa_node_id(), gfp_mask);
+
 		page = __alloc_pages_high_priority(gfp_mask, order,
 				zonelist, high_zoneidx, nodemask,
 				preferred_zone, migratetype);