diff --git a/[refs] b/[refs] index f96ca8f986c8..f98da5abffa3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97d87c9710bc6c5f2585fb9dc58f5bedbe996f10 +refs/heads/master: 2309f9e6fe3f1de661eab9613f7903ab4420c753 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index d3358efdf4e6..d1cf4f05dcda 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -4345,9 +4345,7 @@ void *__init alloc_large_system_hash(const char *tablename, else if (hashdist) table = __vmalloc(size, GFP_ATOMIC, PAGE_KERNEL); else { - unsigned long order; - for (order = 0; ((1UL << order) << PAGE_SHIFT) < size; order++) - ; + unsigned long order = get_order(size); table = (void*) __get_free_pages(GFP_ATOMIC, order); /* * If bucketsize is not a power-of-two, we may free