diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2015-02-10 17:10:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 17:30:32 -0500 |
commit | 937fa39fb22fea1c1d8ca9e5f31c452b91ac7239 (patch) | |
tree | 57ac7fd40db6936891f18b60ab6cc421e6453f33 /arch/microblaze | |
parent | 22f9bf3950f20d24198791685f2dccac2c4ef38a (diff) |
microblaze: 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>
Cc: Michal Simek <monstr@monstr.eu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/microblaze')
-rw-r--r-- | arch/microblaze/include/asm/pgtable.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h index df19d0c47be8..91b9b46fbb5d 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h | |||
@@ -40,10 +40,6 @@ extern int mem_init_done; | |||
40 | #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) }) | 40 | #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) }) |
41 | #define __swp_entry_to_pte(x) ((pte_t) { (x).val }) | 41 | #define __swp_entry_to_pte(x) ((pte_t) { (x).val }) |
42 | 42 | ||
43 | #ifndef __ASSEMBLY__ | ||
44 | static inline int pte_file(pte_t pte) { return 0; } | ||
45 | #endif /* __ASSEMBLY__ */ | ||
46 | |||
47 | #define ZERO_PAGE(vaddr) ({ BUG(); NULL; }) | 43 | #define ZERO_PAGE(vaddr) ({ BUG(); NULL; }) |
48 | 44 | ||
49 | #define swapper_pg_dir ((pgd_t *) NULL) | 45 | #define swapper_pg_dir ((pgd_t *) NULL) |
@@ -207,7 +203,6 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } | |||
207 | 203 | ||
208 | /* Definitions for MicroBlaze. */ | 204 | /* Definitions for MicroBlaze. */ |
209 | #define _PAGE_GUARDED 0x001 /* G: page is guarded from prefetch */ | 205 | #define _PAGE_GUARDED 0x001 /* G: page is guarded from prefetch */ |
210 | #define _PAGE_FILE 0x001 /* when !present: nonlinear file mapping */ | ||
211 | #define _PAGE_PRESENT 0x002 /* software: PTE contains a translation */ | 206 | #define _PAGE_PRESENT 0x002 /* software: PTE contains a translation */ |
212 | #define _PAGE_NO_CACHE 0x004 /* I: caching is inhibited */ | 207 | #define _PAGE_NO_CACHE 0x004 /* I: caching is inhibited */ |
213 | #define _PAGE_WRITETHRU 0x008 /* W: caching is write-through */ | 208 | #define _PAGE_WRITETHRU 0x008 /* W: caching is write-through */ |
@@ -337,7 +332,6 @@ static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_RW; } | |||
337 | static inline int pte_exec(pte_t pte) { return pte_val(pte) & _PAGE_EXEC; } | 332 | static inline int pte_exec(pte_t pte) { return pte_val(pte) & _PAGE_EXEC; } |
338 | static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; } | 333 | static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; } |
339 | static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; } | 334 | static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; } |
340 | static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; } | ||
341 | 335 | ||
342 | static inline void pte_uncache(pte_t pte) { pte_val(pte) |= _PAGE_NO_CACHE; } | 336 | static inline void pte_uncache(pte_t pte) { pte_val(pte) |= _PAGE_NO_CACHE; } |
343 | static inline void pte_cache(pte_t pte) { pte_val(pte) &= ~_PAGE_NO_CACHE; } | 337 | static inline void pte_cache(pte_t pte) { pte_val(pte) &= ~_PAGE_NO_CACHE; } |
@@ -499,11 +493,6 @@ static inline pmd_t *pmd_offset(pgd_t *dir, unsigned long address) | |||
499 | 493 | ||
500 | #define pte_unmap(pte) kunmap_atomic(pte) | 494 | #define pte_unmap(pte) kunmap_atomic(pte) |
501 | 495 | ||
502 | /* Encode and decode a nonlinear file mapping entry */ | ||
503 | #define PTE_FILE_MAX_BITS 29 | ||
504 | #define pte_to_pgoff(pte) (pte_val(pte) >> 3) | ||
505 | #define pgoff_to_pte(off) ((pte_t) { ((off) << 3) | _PAGE_FILE }) | ||
506 | |||
507 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; | 496 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; |
508 | 497 | ||
509 | /* | 498 | /* |