Skip to content

Commit 5d96e0c

Browse files
jungseokleectmarinas
authored andcommitted
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 <[email protected]> Cc: Steve Capper <[email protected]> Signed-off-by: Jungseok Lee <[email protected]> [[email protected]: remove duplicate pmd_page definition] Signed-off-by: Catalin Marinas <[email protected]>
1 parent f7bf130 commit 5d96e0c

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

arch/arm64/include/asm/pgtable.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@ void pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address,
298298
#define pfn_pmd(pfn,prot) (__pmd(((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot)))
299299
#define mk_pmd(page,prot) pfn_pmd(page_to_pfn(page),prot)
300300

301-
#define pmd_page(pmd) pfn_to_page(__phys_to_pfn(pmd_val(pmd) & PHYS_MASK))
302301
#define pud_write(pud) pte_write(pud_pte(pud))
303302
#define pud_pfn(pud) (((pud_val(pud) & PUD_MASK) & PHYS_MASK) >> PAGE_SHIFT)
304303

@@ -401,7 +400,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr)
401400
return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(addr);
402401
}
403402

404-
#define pud_page(pud) pmd_page(pud_pmd(pud))
403+
#define pud_page(pud) pfn_to_page(__phys_to_pfn(pud_val(pud) & PHYS_MASK))
405404

406405
#endif /* CONFIG_ARM64_PGTABLE_LEVELS > 2 */
407406

@@ -437,6 +436,8 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long addr)
437436
return (pud_t *)pgd_page_vaddr(*pgd) + pud_index(addr);
438437
}
439438

439+
#define pgd_page(pgd) pfn_to_page(__phys_to_pfn(pgd_val(pgd) & PHYS_MASK))
440+
440441
#endif /* CONFIG_ARM64_PGTABLE_LEVELS > 3 */
441442

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

0 commit comments

Comments
 (0)