From b07f3f89e252ca4f21878c682c38ae4ae783b2c0 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Wed, 28 Mar 2012 14:42:41 -0700
Subject: [PATCH] --- yaml --- r: 297264 b: refs/heads/master c:
 29fd66d289f2981e11c550f8b411a6d3d38be0cf h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6d88f91be38c..371fa224bfc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45f83cefe3a5f0476ac3f96382ebfdc3fe4caab2
+refs/heads/master: 29fd66d289f2981e11c550f8b411a6d3d38be0cf
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index caea788628e4..c313afcc8e5a 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -2308,6 +2308,10 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
 		if ((gfp_mask & __GFP_FS) && !(gfp_mask & __GFP_NORETRY)) {
 			if (oom_killer_disabled)
 				goto nopage;
+			/* Coredumps can quickly deplete all memory reserves */
+			if ((current->flags & PF_DUMPCORE) &&
+			    !(gfp_mask & __GFP_NOFAIL))
+				goto nopage;
 			page = __alloc_pages_may_oom(gfp_mask, order,
 					zonelist, high_zoneidx,
 					nodemask, preferred_zone,