| From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> |
| Date: Tue, 10 Feb 2015 14:11:25 -0800 |
| Subject: xtensa: drop _PAGE_FILE and pte_file()-related helpers |
| |
| commit d9ecee281b8f89da6d3203be62802eda991e37cc upstream. |
| |
| We've replaced remap_file_pages(2) implementation with emulation. Nobody |
| creates non-linear mapping anymore. |
| |
| Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> |
| Acked-by: Max Filippov <jcmvbkbc@gmail.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/xtensa/include/asm/pgtable.h | 10 ---------- |
| 1 file changed, 10 deletions(-) |
| |
| --- a/arch/xtensa/include/asm/pgtable.h |
| +++ b/arch/xtensa/include/asm/pgtable.h |
| @@ -89,8 +89,6 @@ |
| * (PAGE_NONE)| PPN | 0 | 00 | ADW | 01 | 11 | 11 | |
| * +-----------------------------------------+ |
| * swap | index | type | 01 | 11 | 00 | |
| - * +- - - - - - - - - - - - - - - - - - - - -+ |
| - * file | file offset | 01 | 11 | 10 | |
| * +-----------------------------------------+ |
| * |
| * For T1050 hardware and earlier the layout differs for present and (PAGE_NONE) |
| @@ -111,7 +109,6 @@ |
| * index swap offset / PAGE_SIZE (bit 11-31: 21 bits -> 8 GB) |
| * (note that the index is always non-zero) |
| * type swap type (5 bits -> 32 types) |
| - * file offset 26-bit offset into the file, in increments of PAGE_SIZE |
| * |
| * Notes: |
| * - (PROT_NONE) is a special case of 'present' but causes an exception for |
| @@ -144,7 +141,6 @@ |
| #define _PAGE_HW_VALID 0x00 |
| #define _PAGE_NONE 0x0f |
| #endif |
| -#define _PAGE_FILE (1<<1) /* file mapped page, only if !present */ |
| |
| #define _PAGE_USER (1<<4) /* user access (ring=1) */ |
| |
| @@ -260,7 +256,6 @@ static inline void pgtable_cache_init(vo |
| static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_WRITABLE; } |
| static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; } |
| static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; } |
| -static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; } |
| static inline int pte_special(pte_t pte) { return 0; } |
| |
| static inline pte_t pte_wrprotect(pte_t pte) |
| @@ -388,11 +383,6 @@ ptep_set_wrprotect(struct mm_struct *mm, |
| #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) }) |
| #define __swp_entry_to_pte(x) ((pte_t) { (x).val }) |
| |
| -#define PTE_FILE_MAX_BITS 26 |
| -#define pte_to_pgoff(pte) (pte_val(pte) >> 6) |
| -#define pgoff_to_pte(off) \ |
| - ((pte_t) { ((off) << 6) | _PAGE_CA_INVALID | _PAGE_FILE | _PAGE_USER }) |
| - |
| #endif /* !defined (__ASSEMBLY__) */ |
| |
| |