---

yaml --- r: 151523 b: refs/heads/master c: 6c0db46 h: refs/heads/master i: 151521: 9e860ca 151519: f997a82 v: v3
git-mirror · Jun 17, 2009 · fff6ece · fff6ece
1 parent 01f6d70
commit fff6ece
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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.