Merge remote-tracking branch 'arm64/for-next/core'

diff --cc arch/arm64/include/asm/pgtable.h
index 7b1c67a0b485b6ca7fa55e661e898b1938f4de26,aa150ed99f222e5eff7ba51aee46ebf7e22d79c1..e89f9bef15154be32374366421049f14bbc1661b
--- 1/arch/arm64/include/asm/pgtable.h
--- 2/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@@ -265,8 -258,9 +258,9 @@@ static inline pmd_t pte_pmd(pte_t pte
  #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_pfn(pud)          (((pud_val(pud) & PUD_MASK) & PHYS_MASK) >> PAGE_SHIFT)
  
 -#define set_pmd_at(mm, addr, pmdp, pmd)       set_pmd(pmdp, pmd)
 +#define set_pmd_at(mm, addr, pmdp, pmd)       set_pte_at(mm, addr, (pte_t *)pmdp, pmd_pte(pmd))
  
  static inline int has_transparent_hugepage(void)
  {