.. | .. |
---|
2 | 2 | #ifndef _ASM_POWERPC_NOHASH_64_PGTABLE_4K_H |
---|
3 | 3 | #define _ASM_POWERPC_NOHASH_64_PGTABLE_4K_H |
---|
4 | 4 | |
---|
5 | | -#include <asm-generic/5level-fixup.h> |
---|
| 5 | +#include <asm-generic/pgtable-nop4d.h> |
---|
6 | 6 | |
---|
7 | 7 | /* |
---|
8 | 8 | * Entries per page directory level. The PTE level must use a 64b record |
---|
.. | .. |
---|
45 | 45 | #define PMD_MASKED_BITS 0 |
---|
46 | 46 | /* Bits to mask out from a PUD to get to the PMD page */ |
---|
47 | 47 | #define PUD_MASKED_BITS 0 |
---|
48 | | -/* Bits to mask out from a PGD to get to the PUD page */ |
---|
49 | | -#define PGD_MASKED_BITS 0 |
---|
| 48 | +/* Bits to mask out from a P4D to get to the PUD page */ |
---|
| 49 | +#define P4D_MASKED_BITS 0 |
---|
50 | 50 | |
---|
51 | 51 | |
---|
52 | 52 | /* |
---|
53 | 53 | * 4-level page tables related bits |
---|
54 | 54 | */ |
---|
55 | 55 | |
---|
56 | | -#define pgd_none(pgd) (!pgd_val(pgd)) |
---|
57 | | -#define pgd_bad(pgd) (pgd_val(pgd) == 0) |
---|
58 | | -#define pgd_present(pgd) (pgd_val(pgd) != 0) |
---|
59 | | -#define pgd_page_vaddr(pgd) (pgd_val(pgd) & ~PGD_MASKED_BITS) |
---|
| 56 | +#define p4d_none(p4d) (!p4d_val(p4d)) |
---|
| 57 | +#define p4d_bad(p4d) (p4d_val(p4d) == 0) |
---|
| 58 | +#define p4d_present(p4d) (p4d_val(p4d) != 0) |
---|
60 | 59 | |
---|
61 | 60 | #ifndef __ASSEMBLY__ |
---|
62 | 61 | |
---|
63 | | -static inline void pgd_clear(pgd_t *pgdp) |
---|
| 62 | +static inline pud_t *p4d_pgtable(p4d_t p4d) |
---|
64 | 63 | { |
---|
65 | | - *pgdp = __pgd(0); |
---|
| 64 | + return (pud_t *) (p4d_val(p4d) & ~P4D_MASKED_BITS); |
---|
66 | 65 | } |
---|
67 | 66 | |
---|
68 | | -static inline pte_t pgd_pte(pgd_t pgd) |
---|
| 67 | +static inline void p4d_clear(p4d_t *p4dp) |
---|
69 | 68 | { |
---|
70 | | - return __pte(pgd_val(pgd)); |
---|
| 69 | + *p4dp = __p4d(0); |
---|
71 | 70 | } |
---|
72 | 71 | |
---|
73 | | -static inline pgd_t pte_pgd(pte_t pte) |
---|
| 72 | +static inline pte_t p4d_pte(p4d_t p4d) |
---|
74 | 73 | { |
---|
75 | | - return __pgd(pte_val(pte)); |
---|
| 74 | + return __pte(p4d_val(p4d)); |
---|
76 | 75 | } |
---|
77 | | -extern struct page *pgd_page(pgd_t pgd); |
---|
| 76 | + |
---|
| 77 | +static inline p4d_t pte_p4d(pte_t pte) |
---|
| 78 | +{ |
---|
| 79 | + return __p4d(pte_val(pte)); |
---|
| 80 | +} |
---|
| 81 | +extern struct page *p4d_page(p4d_t p4d); |
---|
78 | 82 | |
---|
79 | 83 | #endif /* !__ASSEMBLY__ */ |
---|
80 | | - |
---|
81 | | -#define pud_offset(pgdp, addr) \ |
---|
82 | | - (((pud_t *) pgd_page_vaddr(*(pgdp))) + \ |
---|
83 | | - (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))) |
---|
84 | 84 | |
---|
85 | 85 | #define pud_ERROR(e) \ |
---|
86 | 86 | pr_err("%s:%d: bad pud %08lx.\n", __FILE__, __LINE__, pud_val(e)) |
---|