Commit 4386c096 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: Rename map_page() to map_kernel_page() on 32-bit 



These two functions implement the same semantics, so unify their naming so we
can share code that calls them. The longer name is more descriptive so use it.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Acked-by: default avatarBalbir Singh <bsingharora@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent d2485644

arch/powerpc/include/asm/book3s/32/pgtable.h

+2 −0
Original line number Diff line number Diff line
@@ -297,6 +297,8 @@ static inline void __ptep_set_access_flags(struct mm_struct *mm, 
extern int get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep,

		      pmd_t **pmdp);



int map_kernel_page(unsigned long va, phys_addr_t pa, int flags);



/* Generic accessors to PTE bits */

static inline int pte_write(pte_t pte)		{ return !!(pte_val(pte) & _PAGE_RW);}

static inline int pte_dirty(pte_t pte)		{ return !!(pte_val(pte) & _PAGE_DIRTY); }

arch/powerpc/include/asm/nohash/32/pgtable.h

+2 −0
Original line number Diff line number Diff line
@@ -340,6 +340,8 @@ static inline void __ptep_set_access_flags(struct mm_struct *mm, 
extern int get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep,

		      pmd_t **pmdp);



int map_kernel_page(unsigned long va, phys_addr_t pa, int flags);



#endif /* !__ASSEMBLY__ */



#endif /* __ASM_POWERPC_NOHASH_32_PGTABLE_H */

arch/powerpc/mm/8xx_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static void mmu_mapin_immr(void) 
	int offset;



	for (offset = 0; offset < IMMR_SIZE; offset += PAGE_SIZE)

		map_page(v + offset, p + offset, f);

		map_kernel_page(v + offset, p + offset, f);

}



/* Address of instructions to patch */

arch/powerpc/mm/dma-noncoherent.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ __dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t 


		do {

			SetPageReserved(page);

			map_page(vaddr, page_to_phys(page),

			map_kernel_page(vaddr, page_to_phys(page),

				 pgprot_val(pgprot_noncached(PAGE_KERNEL)));

			page++;

			vaddr += PAGE_SIZE;

arch/powerpc/mm/mem.c

+2 −2
Original line number Diff line number Diff line
@@ -313,11 +313,11 @@ void __init paging_init(void) 
	unsigned long end = __fix_to_virt(FIX_HOLE);



	for (; v < end; v += PAGE_SIZE)

		map_page(v, 0, 0); /* XXX gross */

		map_kernel_page(v, 0, 0); /* XXX gross */

#endif



#ifdef CONFIG_HIGHMEM

	map_page(PKMAP_BASE, 0, 0);	/* XXX gross */

	map_kernel_page(PKMAP_BASE, 0, 0);	/* XXX gross */

	pkmap_page_table = virt_to_kpte(PKMAP_BASE);



	kmap_pte = virt_to_kpte(__fix_to_virt(FIX_KMAP_BEGIN));