---

yaml --- r: 45245 b: refs/heads/master c: 9ab37b8 h: refs/heads/master i: 45243: 3801285 v: v3
git-mirror · Jan 6, 2007 · 71ee5ff · 71ee5ff
1 parent 2ee41d9
commit 71ee5ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd0ec16fa6cf2498b831663a543e1b67fce6e155
+refs/heads/master: 9ab37b8f21b4dfe256d736c13738d20c88a1f3ad
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -3321,6 +3321,10 @@ void *__init alloc_large_system_hash(const char *tablename,
 			numentries >>= (scale - PAGE_SHIFT);
 		else
 			numentries <<= (PAGE_SHIFT - scale);
+
+		/* Make sure we've got at least a 0-order allocation.. */
+		if (unlikely((numentries * bucketsize) < PAGE_SIZE))
+			numentries = PAGE_SIZE / bucketsize;
 	}
 	numentries = roundup_pow_of_two(numentries);