diff options
Diffstat (limited to 'arch/powerpc/include/asm/nohash/64/pgtable-4k.h')
| -rw-r--r-- | arch/powerpc/include/asm/nohash/64/pgtable-4k.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/arch/powerpc/include/asm/nohash/64/pgtable-4k.h b/arch/powerpc/include/asm/nohash/64/pgtable-4k.h index c40ec32b8194..10f5cf444d72 100644 --- a/arch/powerpc/include/asm/nohash/64/pgtable-4k.h +++ b/arch/powerpc/include/asm/nohash/64/pgtable-4k.h @@ -2,7 +2,7 @@ #ifndef _ASM_POWERPC_NOHASH_64_PGTABLE_4K_H #define _ASM_POWERPC_NOHASH_64_PGTABLE_4K_H -#include <asm-generic/5level-fixup.h> +#include <asm-generic/pgtable-nop4d.h> /* * Entries per page directory level. The PTE level must use a 64b record @@ -45,42 +45,42 @@ #define PMD_MASKED_BITS 0 /* Bits to mask out from a PUD to get to the PMD page */ #define PUD_MASKED_BITS 0 -/* Bits to mask out from a PGD to get to the PUD page */ -#define PGD_MASKED_BITS 0 +/* Bits to mask out from a P4D to get to the PUD page */ +#define P4D_MASKED_BITS 0 /* * 4-level page tables related bits */ -#define pgd_none(pgd) (!pgd_val(pgd)) -#define pgd_bad(pgd) (pgd_val(pgd) == 0) -#define pgd_present(pgd) (pgd_val(pgd) != 0) -#define pgd_page_vaddr(pgd) (pgd_val(pgd) & ~PGD_MASKED_BITS) +#define p4d_none(p4d) (!p4d_val(p4d)) +#define p4d_bad(p4d) (p4d_val(p4d) == 0) +#define p4d_present(p4d) (p4d_val(p4d) != 0) #ifndef __ASSEMBLY__ -static inline void pgd_clear(pgd_t *pgdp) +static inline pud_t *p4d_pgtable(p4d_t p4d) { - *pgdp = __pgd(0); + return (pud_t *) (p4d_val(p4d) & ~P4D_MASKED_BITS); } -static inline pte_t pgd_pte(pgd_t pgd) +static inline void p4d_clear(p4d_t *p4dp) { - return __pte(pgd_val(pgd)); + *p4dp = __p4d(0); } -static inline pgd_t pte_pgd(pte_t pte) +static inline pte_t p4d_pte(p4d_t p4d) { - return __pgd(pte_val(pte)); + return __pte(p4d_val(p4d)); } -extern struct page *pgd_page(pgd_t pgd); -#endif /* !__ASSEMBLY__ */ +static inline p4d_t pte_p4d(pte_t pte) +{ + return __p4d(pte_val(pte)); +} +extern struct page *p4d_page(p4d_t p4d); -#define pud_offset(pgdp, addr) \ - (((pud_t *) pgd_page_vaddr(*(pgdp))) + \ - (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))) +#endif /* !__ASSEMBLY__ */ #define pud_ERROR(e) \ pr_err("%s:%d: bad pud %08lx.\n", __FILE__, __LINE__, pud_val(e)) |