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

Commit 0001e5aa authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: make gup_hugepte() static 



gup_huge_pd() is the only user of gup_hugepte() and it is
located in the same file. This patch moves gup_huge_pd()
after gup_hugepte() and makes gup_hugepte() static.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent b7dcf96c

arch/powerpc/include/asm/pgtable.h

+0 −3
Original line number Diff line number Diff line
@@ -89,9 +89,6 @@ extern void paging_init(void); 
 */

extern void update_mmu_cache(struct vm_area_struct *, unsigned long, pte_t *);



extern int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr,

		       unsigned long end, int write,

		       struct page **pages, int *nr);

#ifndef CONFIG_TRANSPARENT_HUGEPAGE

#define pmd_large(pmd)		0

#endif

arch/powerpc/mm/hugetlbpage.c

+19 −19
Original line number Diff line number Diff line
@@ -539,23 +539,6 @@ static unsigned long hugepte_addr_end(unsigned long addr, unsigned long end, 
	return (__boundary - 1 < end - 1) ? __boundary : end;

}



int gup_huge_pd(hugepd_t hugepd, unsigned long addr, unsigned pdshift,

		unsigned long end, int write, struct page **pages, int *nr)

{

	pte_t *ptep;

	unsigned long sz = 1UL << hugepd_shift(hugepd);

	unsigned long next;



	ptep = hugepte_offset(hugepd, addr, pdshift);

	do {

		next = hugepte_addr_end(addr, end, sz);

		if (!gup_hugepte(ptep, sz, addr, end, write, pages, nr))

			return 0;

	} while (ptep++, addr = next, addr != end);



	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,
@@ -751,7 +734,7 @@ void flush_dcache_icache_hugepage(struct page *page) 
	}

}



int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr,

static int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr,

		       unsigned long end, int write, struct page **pages, int *nr)

{

	unsigned long pte_end;
@@ -798,3 +781,20 @@ int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr, 


	return 1;

}



int gup_huge_pd(hugepd_t hugepd, unsigned long addr, unsigned int pdshift,

		unsigned long end, int write, struct page **pages, int *nr)

{

	pte_t *ptep;

	unsigned long sz = 1UL << hugepd_shift(hugepd);

	unsigned long next;



	ptep = hugepte_offset(hugepd, addr, pdshift);

	do {

		next = hugepte_addr_end(addr, end, sz);

		if (!gup_hugepte(ptep, sz, addr, end, write, pages, nr))

			return 0;

	} while (ptep++, addr = next, addr != end);



	return 1;

}