1 files changed, 7 insertions, 6 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 87e11d8ad536..603bdd01ec2c 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1443,13 +1443,14 @@ static void dissolve_free_huge_page(struct page *page)
 {
         spin_lock(&hugetlb_lock);
         if (PageHuge(page) && !page_count(page)) {
-                struct hstate *h = page_hstate(page);
-                int nid = page_to_nid(page);
-                list_del(&page->lru);
+                struct page *head = compound_head(page);
+                struct hstate *h = page_hstate(head);
+                int nid = page_to_nid(head);
+                list_del(&head->lru);
                 h->free_huge_pages--;
                 h->free_huge_pages_node[nid]--;
                 h->max_huge_pages--;
-                update_and_free_page(h, page);
+                update_and_free_page(h, head);
         }
         spin_unlock(&hugetlb_lock);
 }
@@ -1457,7 +1458,8 @@ static void dissolve_free_huge_page(struct page *page)
 /*
  * Dissolve free hugepages in a given pfn range. Used by memory hotplug to
  * make specified memory blocks removable from the system.
- * Note that start_pfn should aligned with (minimum) hugepage size.
+ * Note that this will dissolve a free gigantic hugepage completely, if any
+ * part of it lies within the given range.
  */
 void dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn)
 {
@@ -1466,7 +1468,6 @@ void dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn)
         if (!hugepages_supported())
                 return;
 
-        VM_BUG_ON(!IS_ALIGNED(start_pfn, 1 << minimum_order));
         for (pfn = start_pfn; pfn < end_pfn; pfn += 1 << minimum_order)
                 dissolve_free_huge_page(pfn_to_page(pfn));
 }