1 files changed, 2 insertions, 2 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index aed085ad11a8..83aff0a4d093 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -319,7 +319,7 @@ unsigned long vma_kernel_pagesize(struct vm_area_struct *vma)
 
         hstate = hstate_vma(vma);
 
-        return 1UL << (hstate->order + PAGE_SHIFT);
+        return 1UL << huge_page_shift(hstate);
 }
 EXPORT_SYMBOL_GPL(vma_kernel_pagesize);
 
@@ -1263,7 +1263,7 @@ static void __init gather_bootmem_prealloc(void)
                  * side-effects, like CommitLimit going negative.
                  */
                 if (h->order > (MAX_ORDER - 1))
-                        totalram_pages += 1 << h->order;
+                        adjust_managed_page_count(page, 1 << h->order);
         }
 }