1 files changed, 15 insertions, 0 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 092b2d8f2f0c..8dadda6e1feb 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3584,6 +3584,21 @@ void *__init alloc_large_system_hash(const char *tablename,
                         for (order = 0; ((1UL << order) << PAGE_SHIFT) < size; 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.
+                         */
+                        if (table) {
+                                unsigned long alloc_end = (unsigned long)table +
+                                                (PAGE_SIZE << order);
+                                unsigned long used = (unsigned long)table +
+                                                PAGE_ALIGN(size);
+                                split_page(virt_to_page(table), order);
+                                while (used < alloc_end) {
+                                        free_page(used);
+                                        used += PAGE_SIZE;
+                                }
+                        }
                 }
         } while (!table && size > PAGE_SIZE && --log2qty);