Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 103f3d9a26df944f4c29de190d72dfbf913c71af

Authored by Kirill A. Shutemov
Committed by Linus Torvalds
1 parent f5b45de9b0
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

cris: 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: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 3 changed files with 0 additions and 10 deletions Side-by-side Diff

arch/cris/include/arch-v10/arch/mmu.h
Diff comments   View file @ 103f3d9
... ... @@ -58,7 +58,6 @@
58 58 /* Bits the HW doesn't care about but the kernel uses them in SW */
59 59  
60 60 #define _PAGE_PRESENT (1<<4) /* page present in memory */
61   -#define _PAGE_FILE (1<<5) /* set: pagecache, unset: swap (when !PRESENT) */
62 61 #define _PAGE_ACCESSED (1<<5) /* simulated in software using valid bit */
63 62 #define _PAGE_MODIFIED (1<<6) /* simulated in software using we bit */
64 63 #define _PAGE_READ (1<<7) /* read-enabled */
... ... @@ -104,8 +103,6 @@
104 103 #define __S101 PAGE_READONLY
105 104 #define __S110 PAGE_SHARED
106 105 #define __S111 PAGE_SHARED
107   -
108   -#define PTE_FILE_MAX_BITS 26
109 106  
110 107 #endif
arch/cris/include/arch-v32/arch/mmu.h
Diff comments   View file @ 103f3d9
... ... @@ -53,7 +53,6 @@
53 53 * software.
54 54 */
55 55 #define _PAGE_PRESENT (1 << 5) /* Page is present in memory. */
56   -#define _PAGE_FILE (1 << 6) /* 1=pagecache, 0=swap (when !present) */
57 56 #define _PAGE_ACCESSED (1 << 6) /* Simulated in software using valid bit. */
58 57 #define _PAGE_MODIFIED (1 << 7) /* Simulated in software using we bit. */
59 58 #define _PAGE_READ (1 << 8) /* Read enabled. */
... ... @@ -107,8 +106,6 @@
107 106 #define __S101 PAGE_READONLY_EXEC
108 107 #define __S110 PAGE_SHARED_EXEC
109 108 #define __S111 PAGE_SHARED_EXEC
110   -
111   -#define PTE_FILE_MAX_BITS 25
112 109  
113 110 #endif /* _ASM_CRIS_ARCH_MMU_H */
arch/cris/include/asm/pgtable.h
Diff comments   View file @ 103f3d9
... ... @@ -114,7 +114,6 @@
114 114 static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_WRITE; }
115 115 static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_MODIFIED; }
116 116 static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; }
117   -static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; }
118 117 static inline int pte_special(pte_t pte) { return 0; }
119 118  
120 119 static inline pte_t pte_wrprotect(pte_t pte)
... ... @@ -289,9 +288,6 @@
289 288 * No page table caches to initialise
290 289 */
291 290 #define pgtable_cache_init() do { } while (0)
292   -
293   -#define pte_to_pgoff(x) (pte_val(x) >> 6)
294   -#define pgoff_to_pte(x) __pte(((x) << 6) | _PAGE_FILE)
295 291  
296 292 typedef pte_t *pte_addr_t;
297 293