diff --git a/[refs] b/[refs] index d674b4e935c4..6b5759330e54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 962749af67b145c57917bfbff3c303ebd7d5988c +refs/heads/master: 6e692ed37a507e18d8afe8e5faebd8c4722c5f12 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 637f57ff5b5a..338a02bb004d 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -2702,8 +2702,7 @@ void *__init alloc_large_system_hash(const char *tablename, else numentries <<= (PAGE_SHIFT - scale); } - /* rounded up to nearest power of 2 in size */ - numentries = 1UL << (long_log2(numentries) + 1); + numentries = roundup_pow_of_two(numentries); /* limit allocation size to 1/16 total memory by default */ if (max == 0) {