Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...

[~andy/linux] / mm / hugetlb.c

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index aed085ad11a8bc3fcf3876453192f7fab4a777c2..83aff0a4d0938e308619a703dfca17265419e628 100644 (file)
--- 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);
        }
 }