diff options
Diffstat (limited to 'arch/powerpc/include/asm/pgtable.h')
| -rw-r--r-- | arch/powerpc/include/asm/pgtable.h | 12 | 
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h index b1f1d5339735..ae58b524a924 100644 --- a/arch/powerpc/include/asm/pgtable.h +++ b/arch/powerpc/include/asm/pgtable.h @@ -44,12 +44,12 @@ struct mm_struct;  #ifdef CONFIG_PPC32  static inline pmd_t *pmd_ptr(struct mm_struct *mm, unsigned long va)  { -	return pmd_offset(pud_offset(pgd_offset(mm, va), va), va); +	return pmd_offset(pud_offset(p4d_offset(pgd_offset(mm, va), va), va), va);  }  static inline pmd_t *pmd_ptr_k(unsigned long va)  { -	return pmd_offset(pud_offset(pgd_offset_k(va), va), va); +	return pmd_offset(pud_offset(p4d_offset(pgd_offset_k(va), va), va), va);  }  static inline pte_t *virt_to_kpte(unsigned long vaddr) @@ -107,6 +107,8 @@ unsigned long vmalloc_to_phys(void *vmalloc_addr);  void pgtable_cache_add(unsigned int shift); +pte_t *early_pte_alloc_kernel(pmd_t *pmdp, unsigned long va); +  #if defined(CONFIG_STRICT_KERNEL_RWX) || defined(CONFIG_PPC32)  void mark_initmem_nx(void);  #else @@ -158,9 +160,9 @@ static inline bool pud_is_leaf(pud_t pud)  }  #endif -#ifndef pgd_is_leaf -#define pgd_is_leaf pgd_is_leaf -static inline bool pgd_is_leaf(pgd_t pgd) +#ifndef p4d_is_leaf +#define p4d_is_leaf p4d_is_leaf +static inline bool p4d_is_leaf(p4d_t p4d)  {  	return false;  }  | 
