diff --git a/[refs] b/[refs]
index 63643e242a0d..1047bdb2793b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 887032670d47366a8c8f25396ea7c14b7b2cc620
+refs/heads/master: 1fc28b70fe2dbf87e061b6ce5091a1f8e4e5d4e7
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 2dbb2fc68837..d052abbe3063 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1745,8 +1745,10 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
 	 * be using allocators in order of preference for an area that is
 	 * too large.
 	 */
-	if (WARN_ON_ONCE(order >= MAX_ORDER))
+	if (order >= MAX_ORDER) {
+		WARN_ON_ONCE(!(gfp_mask & __GFP_NOWARN));
 		return NULL;
+	}
 
 	/*
 	 * GFP_THISNODE (meaning __GFP_THISNODE, __GFP_NORETRY and