diff options
| -rw-r--r-- | arch/xtensa/include/asm/pgtable.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/xtensa/include/asm/pgtable.h b/arch/xtensa/include/asm/pgtable.h index 872bf0194e6d..01b80dce9d65 100644 --- a/arch/xtensa/include/asm/pgtable.h +++ b/arch/xtensa/include/asm/pgtable.h | |||
| @@ -89,8 +89,6 @@ | |||
| 89 | * (PAGE_NONE)| PPN | 0 | 00 | ADW | 01 | 11 | 11 | | 89 | * (PAGE_NONE)| PPN | 0 | 00 | ADW | 01 | 11 | 11 | |
| 90 | * +-----------------------------------------+ | 90 | * +-----------------------------------------+ |
| 91 | * swap | index | type | 01 | 11 | 00 | | 91 | * swap | index | type | 01 | 11 | 00 | |
| 92 | * +- - - - - - - - - - - - - - - - - - - - -+ | ||
| 93 | * file | file offset | 01 | 11 | 10 | | ||
| 94 | * +-----------------------------------------+ | 92 | * +-----------------------------------------+ |
| 95 | * | 93 | * |
| 96 | * For T1050 hardware and earlier the layout differs for present and (PAGE_NONE) | 94 | * For T1050 hardware and earlier the layout differs for present and (PAGE_NONE) |
| @@ -111,7 +109,6 @@ | |||
| 111 | * index swap offset / PAGE_SIZE (bit 11-31: 21 bits -> 8 GB) | 109 | * index swap offset / PAGE_SIZE (bit 11-31: 21 bits -> 8 GB) |
| 112 | * (note that the index is always non-zero) | 110 | * (note that the index is always non-zero) |
| 113 | * type swap type (5 bits -> 32 types) | 111 | * type swap type (5 bits -> 32 types) |
| 114 | * file offset 26-bit offset into the file, in increments of PAGE_SIZE | ||
| 115 | * | 112 | * |
| 116 | * Notes: | 113 | * Notes: |
| 117 | * - (PROT_NONE) is a special case of 'present' but causes an exception for | 114 | * - (PROT_NONE) is a special case of 'present' but causes an exception for |
| @@ -144,7 +141,6 @@ | |||
| 144 | #define _PAGE_HW_VALID 0x00 | 141 | #define _PAGE_HW_VALID 0x00 |
| 145 | #define _PAGE_NONE 0x0f | 142 | #define _PAGE_NONE 0x0f |
| 146 | #endif | 143 | #endif |
| 147 | #define _PAGE_FILE (1<<1) /* file mapped page, only if !present */ | ||
| 148 | 144 | ||
| 149 | #define _PAGE_USER (1<<4) /* user access (ring=1) */ | 145 | #define _PAGE_USER (1<<4) /* user access (ring=1) */ |
| 150 | 146 | ||
| @@ -260,7 +256,6 @@ static inline void pgtable_cache_init(void) { } | |||
| 260 | static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_WRITABLE; } | 256 | static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_WRITABLE; } |
| 261 | static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; } | 257 | static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; } |
| 262 | static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; } | 258 | static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; } |
| 263 | static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; } | ||
| 264 | static inline int pte_special(pte_t pte) { return 0; } | 259 | static inline int pte_special(pte_t pte) { return 0; } |
| 265 | 260 | ||
| 266 | static inline pte_t pte_wrprotect(pte_t pte) | 261 | static inline pte_t pte_wrprotect(pte_t pte) |
| @@ -390,11 +385,6 @@ ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep) | |||
| 390 | #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) }) | 385 | #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) }) |
| 391 | #define __swp_entry_to_pte(x) ((pte_t) { (x).val }) | 386 | #define __swp_entry_to_pte(x) ((pte_t) { (x).val }) |
| 392 | 387 | ||
| 393 | #define PTE_FILE_MAX_BITS 26 | ||
| 394 | #define pte_to_pgoff(pte) (pte_val(pte) >> 6) | ||
| 395 | #define pgoff_to_pte(off) \ | ||
| 396 | ((pte_t) { ((off) << 6) | _PAGE_CA_INVALID | _PAGE_FILE | _PAGE_USER }) | ||
| 397 | |||
| 398 | #endif /* !defined (__ASSEMBLY__) */ | 388 | #endif /* !defined (__ASSEMBLY__) */ |
| 399 | 389 | ||
| 400 | 390 | ||
