diff --git a/[refs] b/[refs]
index 5183fc255ab5..4f536fd472ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58568d2a8215cb6f55caf2332017d7bdff954e1c
+refs/heads/master: 6c0db4664b49417d80988953e69c323721353227
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 7cc3179e3591..cbed869fd831 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -4511,7 +4511,10 @@ void *__init alloc_large_system_hash(const char *tablename,
 			table = __vmalloc(size, GFP_ATOMIC, PAGE_KERNEL);
 		else {
 			unsigned long order = get_order(size);
-			table = (void*) __get_free_pages(GFP_ATOMIC, order);
+
+			if (order < MAX_ORDER)
+				table = (void *)__get_free_pages(GFP_ATOMIC,
+								order);
 			/*
 			 * If bucketsize is not a power-of-two, we may free
 			 * some pages at the end of hash table.