---

yaml --- r: 156033 b: refs/heads/master c: 6583bb6 h: refs/heads/master i: 156031: 8c219f8 v: v3
git-mirror · Jul 30, 2009 · 4e5e0b8 · 4e5e0b8
1 parent 886ba4a
commit 4e5e0b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e084b2d95e48b31aa45f9c49ffc6cdae8bdb21d4
+refs/heads/master: 6583bb64fc370842b32a87c67750c26f6d559af0
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -1794,6 +1794,10 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
 	if (p->flags & PF_MEMALLOC)
 		goto nopage;
 
+	/* Avoid allocations with no watermarks from looping endlessly */
+	if (test_thread_flag(TIF_MEMDIE) && !(gfp_mask & __GFP_NOFAIL))
+		goto nopage;
+
 	/* Try direct reclaim and then allocating */
 	page = __alloc_pages_direct_reclaim(gfp_mask, order,
 					zonelist, high_zoneidx,