aboutsummaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
authorHugh Dickins <hugh.dickins@tiscali.co.uk>2009-06-16 18:31:50 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 22:47:31 -0400
commit6c0db4664b49417d80988953e69c323721353227 (patch)
tree83ec1fcf3607b06c8c3cc2d39b5d10a61289cdd6 /mm/page_alloc.c
parent58568d2a8215cb6f55caf2332017d7bdff954e1c (diff)
mm: alloc_large_system_hash check order
On an x86_64 with 4GB ram, tcp_init()'s call to alloc_large_system_hash(), to allocate tcp_hashinfo.ehash, is now triggering an mmotm WARN_ON_ONCE on order >= MAX_ORDER - it's hoping for order 11. alloc_large_system_hash() had better make its own check on the order. Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk> Cc: David Miller <davem@davemloft.net> Cc: Mel Gorman <mel@csn.ul.ie> Cc: Eric Dumazet <dada1@cosmosbay.com> Cc: Christoph Lameter <cl@linux.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r--mm/page_alloc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 7cc3179e3591..cbed869fd831 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4511,7 +4511,10 @@ void *__init alloc_large_system_hash(const char *tablename,
4511 table = __vmalloc(size, GFP_ATOMIC, PAGE_KERNEL); 4511 table = __vmalloc(size, GFP_ATOMIC, PAGE_KERNEL);
4512 else { 4512 else {
4513 unsigned long order = get_order(size); 4513 unsigned long order = get_order(size);
4514 table = (void*) __get_free_pages(GFP_ATOMIC, order); 4514
4515 if (order < MAX_ORDER)
4516 table = (void *)__get_free_pages(GFP_ATOMIC,
4517 order);
4515 /* 4518 /*
4516 * If bucketsize is not a power-of-two, we may free 4519 * If bucketsize is not a power-of-two, we may free
4517 * some pages at the end of hash table. 4520 * some pages at the end of hash table.