---

yaml --- r: 230770 b: refs/heads/master c: 5c3240d h: refs/heads/master v: v3
git-mirror · Jan 14, 2011 · 7d964fa · 7d964fa
1 parent 4db88cf
commit 7d964fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32dba98e085f8b2b4345887df9abf5e0e93bfc12
+refs/heads/master: 5c3240d92e29ae7bfb9cb58a9b37e80ab40894ff
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -1971,7 +1971,12 @@ gfp_to_alloc_flags(gfp_t gfp_mask)
 	alloc_flags |= (__force int) (gfp_mask & __GFP_HIGH);
 
 	if (!wait) {
-		alloc_flags |= ALLOC_HARDER;
+		/*
+		 * Not worth trying to allocate harder for
+		 * __GFP_NOMEMALLOC even if it can't schedule.
+		 */
+		if  (!(gfp_mask & __GFP_NOMEMALLOC))
+			alloc_flags |= ALLOC_HARDER;
 		/*
 		 * Ignore cpuset if GFP_ATOMIC (!wait) rather than fail alloc.
 		 * See also cpuset_zone_allowed() comment in kernel/cpuset.c.