From 713f8c381a22f03525161edd004e632bcf3b101b Mon Sep 17 00:00:00 2001
From: Mel Gorman <mel@csn.ul.ie>
Date: Wed, 29 Jul 2009 15:04:08 -0700
Subject: [PATCH] --- yaml --- r: 156047 b: refs/heads/master c:
 1fc28b70fe2dbf87e061b6ce5091a1f8e4e5d4e7 h: refs/heads/master i:   156045:
 ea278ba31319817cd5716c988f9435da44874cba   156043:
 c0c3d66667612fa8d16f42415ef3da48ef122bb8   156039:
 ccb5b3e050623f705d402768be1773c975ea4cba   156031:
 8c219f8a576352beebaeff0b9d83239a30135221 v: v3

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

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