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

Commit 9ab6d02f authored by Will Deacon's avatar Will Deacon Committed by Catalin Marinas
Browse files

arm64: pgtable: use pte_index instead of __pte_index 



pte_index is a useful helper outside of arch/arm64, for things like the
ARM SMMU driver, so rename __pte_index to pte_index to be consistent
with both arch/arm/ and also the definitions of pmd_index and pgd_index.

Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 6916b14e

arch/arm64/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ extern struct page *empty_zero_page; 
#define pte_none(pte)		(!pte_val(pte))

#define pte_clear(mm,addr,ptep)	set_pte(ptep, __pte(0))

#define pte_page(pte)		(pfn_to_page(pte_pfn(pte)))

#define pte_offset_kernel(dir,addr)	(pmd_page_vaddr(*(dir)) + __pte_index(addr))

#define pte_offset_kernel(dir,addr)	(pmd_page_vaddr(*(dir)) + pte_index(addr))



#define pte_offset_map(dir,addr)	pte_offset_kernel((dir), (addr))

#define pte_offset_map_nested(dir,addr)	pte_offset_kernel((dir), (addr))
@@ -263,7 +263,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr) 
#endif



/* Find an entry in the third-level page table.. */

#define __pte_index(addr)	(((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))

#define pte_index(addr)		(((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))



static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)

{