Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2415cf12 authored by Wanpeng Li's avatar Wanpeng Li Committed by Linus Torvalds
Browse files

mm/hugetlb: use already existing interface huge_page_shift 



Use the already existing interface huge_page_shift instead of h->order +
PAGE_SHIFT.

Signed-off-by: default avatarWanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: default avatarMichal Hocko <mhocko@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5f1e31d2

arch/powerpc/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

mm/hugetlb.c

+1 −1
Original line number Diff line number Diff line
@@ -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);