diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2015-02-10 17:10:12 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 17:30:31 -0500 |
commit | 18747151308f9e0fb63766057957617ec4afa190 (patch) | |
tree | d29ce491cf6eef425d438155ffa91c5da36bc8c6 /arch/arc | |
parent | b816157a5366550c5ee29a6431ba1abb88721266 (diff) |
arc: drop _PAGE_FILE and pte_file()-related helpers
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: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arc')
-rw-r--r-- | arch/arc/include/asm/pgtable.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/arc/include/asm/pgtable.h b/arch/arc/include/asm/pgtable.h index 6b0b7f7ef783..bdc8ccaf390d 100644 --- a/arch/arc/include/asm/pgtable.h +++ b/arch/arc/include/asm/pgtable.h | |||
@@ -61,7 +61,6 @@ | |||
61 | #define _PAGE_WRITE (1<<4) /* Page has user write perm (H) */ | 61 | #define _PAGE_WRITE (1<<4) /* Page has user write perm (H) */ |
62 | #define _PAGE_READ (1<<5) /* Page has user read perm (H) */ | 62 | #define _PAGE_READ (1<<5) /* Page has user read perm (H) */ |
63 | #define _PAGE_MODIFIED (1<<6) /* Page modified (dirty) (S) */ | 63 | #define _PAGE_MODIFIED (1<<6) /* Page modified (dirty) (S) */ |
64 | #define _PAGE_FILE (1<<7) /* page cache/ swap (S) */ | ||
65 | #define _PAGE_GLOBAL (1<<8) /* Page is global (H) */ | 64 | #define _PAGE_GLOBAL (1<<8) /* Page is global (H) */ |
66 | #define _PAGE_PRESENT (1<<10) /* TLB entry is valid (H) */ | 65 | #define _PAGE_PRESENT (1<<10) /* TLB entry is valid (H) */ |
67 | 66 | ||
@@ -73,7 +72,6 @@ | |||
73 | #define _PAGE_READ (1<<3) /* Page has user read perm (H) */ | 72 | #define _PAGE_READ (1<<3) /* Page has user read perm (H) */ |
74 | #define _PAGE_ACCESSED (1<<4) /* Page is accessed (S) */ | 73 | #define _PAGE_ACCESSED (1<<4) /* Page is accessed (S) */ |
75 | #define _PAGE_MODIFIED (1<<5) /* Page modified (dirty) (S) */ | 74 | #define _PAGE_MODIFIED (1<<5) /* Page modified (dirty) (S) */ |
76 | #define _PAGE_FILE (1<<6) /* page cache/ swap (S) */ | ||
77 | #define _PAGE_GLOBAL (1<<8) /* Page is global (H) */ | 75 | #define _PAGE_GLOBAL (1<<8) /* Page is global (H) */ |
78 | #define _PAGE_PRESENT (1<<9) /* TLB entry is valid (H) */ | 76 | #define _PAGE_PRESENT (1<<9) /* TLB entry is valid (H) */ |
79 | #define _PAGE_SHARED_CODE (1<<11) /* Shared Code page with cmn vaddr | 77 | #define _PAGE_SHARED_CODE (1<<11) /* Shared Code page with cmn vaddr |
@@ -268,15 +266,6 @@ static inline void pmd_set(pmd_t *pmdp, pte_t *ptep) | |||
268 | pte; \ | 266 | pte; \ |
269 | }) | 267 | }) |
270 | 268 | ||
271 | /* TBD: Non linear mapping stuff */ | ||
272 | static inline int pte_file(pte_t pte) | ||
273 | { | ||
274 | return pte_val(pte) & _PAGE_FILE; | ||
275 | } | ||
276 | |||
277 | #define PTE_FILE_MAX_BITS 30 | ||
278 | #define pgoff_to_pte(x) __pte(x) | ||
279 | #define pte_to_pgoff(x) (pte_val(x) >> 2) | ||
280 | #define pte_pfn(pte) (pte_val(pte) >> PAGE_SHIFT) | 269 | #define pte_pfn(pte) (pte_val(pte) >> PAGE_SHIFT) |
281 | #define pfn_pte(pfn, prot) (__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))) | 270 | #define pfn_pte(pfn, prot) (__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))) |
282 | #define __pte_index(addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) | 271 | #define __pte_index(addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) |
@@ -364,7 +353,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, | |||
364 | 353 | ||
365 | /* Encode swap {type,off} tuple into PTE | 354 | /* Encode swap {type,off} tuple into PTE |
366 | * We reserve 13 bits for 5-bit @type, keeping bits 12-5 zero, ensuring that | 355 | * We reserve 13 bits for 5-bit @type, keeping bits 12-5 zero, ensuring that |
367 | * both PAGE_FILE and PAGE_PRESENT are zero in a PTE holding swap "identifier" | 356 | * PAGE_PRESENT is zero in a PTE holding swap "identifier" |
368 | */ | 357 | */ |
369 | #define __swp_entry(type, off) ((swp_entry_t) { \ | 358 | #define __swp_entry(type, off) ((swp_entry_t) { \ |
370 | ((type) & 0x1f) | ((off) << 13) }) | 359 | ((type) & 0x1f) | ((off) << 13) }) |