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

Commit 76512959 authored by Becky Bruce's avatar Becky Bruce Committed by Benjamin Herrenschmidt
Browse files

powerpc: Only define HAVE_ARCH_HUGETLB_UNMAPPED_AREA if PPC_MM_SLICES 



If we don't have slices, we should be able to use the generic
hugetlb_get_unmapped_area() code

Signed-off-by: default avatarBecky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent fa8cbaaf

arch/powerpc/include/asm/page_64.h

+2 −0
Original line number Diff line number Diff line
@@ -130,7 +130,9 @@ do { \ 


#ifdef CONFIG_HUGETLB_PAGE



#ifdef CONFIG_PPC_MM_SLICES

#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA

#endif



#endif /* !CONFIG_HUGETLB_PAGE */

arch/powerpc/mm/hugetlbpage.c

+2 −4
Original line number Diff line number Diff line
@@ -697,19 +697,17 @@ int gup_hugepd(hugepd_t *hugepd, unsigned pdshift, 
	return 1;

}



#ifdef CONFIG_PPC_MM_SLICES

unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,

					unsigned long len, unsigned long pgoff,

					unsigned long flags)

{

#ifdef CONFIG_PPC_MM_SLICES

	struct hstate *hstate = hstate_file(file);

	int mmu_psize = shift_to_mmu_psize(huge_page_shift(hstate));



	return slice_get_unmapped_area(addr, len, flags, mmu_psize, 1, 0);

#else

	return get_unmapped_area(file, addr, len, pgoff, flags);

#endif

}

#endif



unsigned long vma_mmu_pagesize(struct vm_area_struct *vma)

{