From 9b61f5721a28b2242aaed78fb9bc5f7dfd0ee176 Mon Sep 17 00:00:00 2001
From: Mel Gorman <mel@csn.ul.ie>
Date: Tue, 16 Jun 2009 15:31:53 -0700
Subject: [PATCH] --- yaml --- r: 151525 b: refs/heads/master c:
 b3c466ce512923298ae8c0121d3e9f397a3f1210 h: refs/heads/master i:   151523:
 fff6ece3224bb1431bbd149908efec7274e8b6c2 v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/gfp.h | 6 ------
 trunk/mm/page_alloc.c     | 3 +++
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9b3558dfebc0..31a0b40c2979 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d239171e4f6efd58d7e423853056b1b6a74f1446
+refs/heads/master: b3c466ce512923298ae8c0121d3e9f397a3f1210
diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h
index 549ec5583103..c2d3fe03b5d2 100644
--- a/trunk/include/linux/gfp.h
+++ b/trunk/include/linux/gfp.h
@@ -185,9 +185,6 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
 static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask,
 						unsigned int order)
 {
-	if (unlikely(order >= MAX_ORDER))
-		return NULL;
-
 	/* Unknown node is current node */
 	if (nid < 0)
 		nid = numa_node_id();
@@ -201,9 +198,6 @@ extern struct page *alloc_pages_current(gfp_t gfp_mask, unsigned order);
 static inline struct page *
 alloc_pages(gfp_t gfp_mask, unsigned int order)
 {
-	if (unlikely(order >= MAX_ORDER))
-		return NULL;
-
 	return alloc_pages_current(gfp_mask, order);
 }
 extern struct page *alloc_page_vma(gfp_t gfp_mask,
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index d58df9031503..bfbd95c0610f 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1401,6 +1401,9 @@ get_page_from_freelist(gfp_t gfp_mask, nodemask_t *nodemask, unsigned int order,
 
 	classzone_idx = zone_idx(preferred_zone);
 
+	if (WARN_ON_ONCE(order >= MAX_ORDER))
+		return NULL;
+
 zonelist_scan:
 	/*
 	 * Scan zonelist, looking for a zone with enough free.