---

yaml --- r: 320823 b: refs/heads/master c: 183f637 h: refs/heads/master i: 320821: 943c943 320819: bcc2536 320815: f32dc24 v: v3
git-mirror · Aug 1, 2012 · a7ec6be · a7ec6be
1 parent 6bdb894
commit a7ec6be
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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);