Messages in this thread Patch in this message | | | From | Wanpeng Li <> | Subject | [PATCH v3 4/6] mm/hugetlb: use already exist interface huge_page_shift | Date | Sun, 26 May 2013 13:58:39 +0800 |
| |
Changelog: v1 -> v2: * update alloc_bootmem_huge_page in powerpc * add Michal reviewed-by
Use already exist interface huge_page_shift instead of h->order + PAGE_SHIFT.
Reviewed-by: Michal Hocko <mhocko@suse.cz> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com> --- arch/powerpc/mm/hugetlbpage.c | 2 +- mm/hugetlb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 237c8e5..cafec93 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c @@ -357,7 +357,7 @@ void add_gpage(u64 addr, u64 page_size, unsigned long number_of_pages) int alloc_bootmem_huge_page(struct hstate *hstate) { struct huge_bootmem_page *m; - int idx = shift_to_mmu_psize(hstate->order + PAGE_SHIFT); + int idx = shift_to_mmu_psize(huge_page_shift(hstate)); int nr_gpages = gpage_freearray[idx].nr_gpages; if (nr_gpages == 0) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index f8feeec..b6ff0ee 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); -- 1.8.1.2
| |