1 files changed, 3 insertions, 2 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 12908dcf5831..d7a802427ea8 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1214,8 +1214,8 @@ void free_huge_page(struct page *page)
 
         set_page_private(page, 0);
         page->mapping = NULL;
-        BUG_ON(page_count(page));
-        BUG_ON(page_mapcount(page));
+        VM_BUG_ON_PAGE(page_count(page), page);
+        VM_BUG_ON_PAGE(page_mapcount(page), page);
         restore_reserve = PagePrivate(page);
         ClearPagePrivate(page);
 
@@ -1286,6 +1286,7 @@ static void prep_compound_gigantic_page(struct page *page, unsigned int order)
                 set_page_count(p, 0);
                 set_compound_head(p, page);
         }
+        atomic_set(compound_mapcount_ptr(page), -1);
 }
 
 /*