diff --git a/[refs] b/[refs]
index 9f0b1697dee9..895cec7f85e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4d28dd4b12649d02a89d19e6bd12ab92a6fcd4e
+refs/heads/master: 885036d32f5d3c427c3e2b385b5a5503805e3e52
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 987225bdd661..b37dc0f78d07 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -895,6 +895,7 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
 	if (((p->flags & PF_MEMALLOC) || unlikely(test_thread_flag(TIF_MEMDIE)))
 			&& !in_interrupt()) {
 		if (!(gfp_mask & __GFP_NOMEMALLOC)) {
+nofail_alloc:
 			/* go through the zonelist yet again, ignoring mins */
 			for (i = 0; (z = zones[i]) != NULL; i++) {
 				if (!cpuset_zone_allowed(z, gfp_mask))
@@ -903,6 +904,10 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
 				if (page)
 					goto got_pg;
 			}
+			if (gfp_mask & __GFP_NOFAIL) {
+				blk_congestion_wait(WRITE, HZ/50);
+				goto nofail_alloc;
+			}
 		}
 		goto nopage;
 	}