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

Commit 5d96e0cb authored by Jungseok Lee's avatar Jungseok Lee Committed by Catalin Marinas
Browse files

arm64: mm: Add pgd_page to support RCU fast_gup 



This patch adds pgd_page definition in order to keep supporting
HAVE_GENERIC_RCU_GUP configuration. In addition, it changes pud_page
expression to align with pmd_page for readability.

An introduction of pgd_page resolves the following build breakage
under 4KB + 4Level memory management combo.

mm/gup.c: In function 'gup_huge_pgd':
mm/gup.c:889:2: error: implicit declaration of function 'pgd_page' [-Werror=implicit-function-declaration]
  head = pgd_page(orig);
  ^
mm/gup.c:889:7: warning: assignment makes pointer from integer without a cast
  head = pgd_page(orig);

Cc: Will Deacon <will.deacon@arm.com>
Cc: Steve Capper <steve.capper@linaro.org>
Signed-off-by: default avatarJungseok Lee <jungseoklee85@gmail.com>
[catalin.marinas@arm.com: remove duplicate pmd_page definition]
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent f7bf130e

arch/arm64/include/asm/pgtable.h

+3 −2
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ void pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address, 
#define pfn_pmd(pfn,prot)	(__pmd(((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot)))

#define mk_pmd(page,prot)	pfn_pmd(page_to_pfn(page),prot)



#define pmd_page(pmd)           pfn_to_page(__phys_to_pfn(pmd_val(pmd) & PHYS_MASK))

#define pud_write(pud)		pte_write(pud_pte(pud))

#define pud_pfn(pud)		(((pud_val(pud) & PUD_MASK) & PHYS_MASK) >> PAGE_SHIFT)
@@ -401,7 +400,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr) 
	return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(addr);

}



#define pud_page(pud)           pmd_page(pud_pmd(pud))

#define pud_page(pud)		pfn_to_page(__phys_to_pfn(pud_val(pud) & PHYS_MASK))



#endif	/* CONFIG_ARM64_PGTABLE_LEVELS > 2 */
@@ -437,6 +436,8 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long addr) 
	return (pud_t *)pgd_page_vaddr(*pgd) + pud_index(addr);

}



#define pgd_page(pgd)		pfn_to_page(__phys_to_pfn(pgd_val(pgd) & PHYS_MASK))



#endif  /* CONFIG_ARM64_PGTABLE_LEVELS > 3 */



#define pgd_ERROR(pgd)		__pgd_error(__FILE__, __LINE__, pgd_val(pgd))