diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2015-02-10 17:11:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 17:30:33 -0500 |
commit | 40171798fe11a6dc1d963058b097b2c4c9d34a9c (patch) | |
tree | f38e87814df5c4febb8713d885a20fd604f07d99 /arch/unicore32 | |
parent | 3513006a5691ae3629eef9ddef0b71a47c40dfbc (diff) |
unicore32: drop 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: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/unicore32')
-rw-r--r-- | arch/unicore32/include/asm/pgtable-hwdef.h | 1 | ||||
-rw-r--r-- | arch/unicore32/include/asm/pgtable.h | 14 |
2 files changed, 0 insertions, 15 deletions
diff --git a/arch/unicore32/include/asm/pgtable-hwdef.h b/arch/unicore32/include/asm/pgtable-hwdef.h index 7314e859cca0..e37fa471c2be 100644 --- a/arch/unicore32/include/asm/pgtable-hwdef.h +++ b/arch/unicore32/include/asm/pgtable-hwdef.h | |||
@@ -44,7 +44,6 @@ | |||
44 | #define PTE_TYPE_INVALID (3 << 0) | 44 | #define PTE_TYPE_INVALID (3 << 0) |
45 | 45 | ||
46 | #define PTE_PRESENT (1 << 2) | 46 | #define PTE_PRESENT (1 << 2) |
47 | #define PTE_FILE (1 << 3) /* only when !PRESENT */ | ||
48 | #define PTE_YOUNG (1 << 3) | 47 | #define PTE_YOUNG (1 << 3) |
49 | #define PTE_DIRTY (1 << 4) | 48 | #define PTE_DIRTY (1 << 4) |
50 | #define PTE_CACHEABLE (1 << 5) | 49 | #define PTE_CACHEABLE (1 << 5) |
diff --git a/arch/unicore32/include/asm/pgtable.h b/arch/unicore32/include/asm/pgtable.h index ed6f7d000fba..818d0f5598e3 100644 --- a/arch/unicore32/include/asm/pgtable.h +++ b/arch/unicore32/include/asm/pgtable.h | |||
@@ -283,20 +283,6 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; | |||
283 | #define MAX_SWAPFILES_CHECK() \ | 283 | #define MAX_SWAPFILES_CHECK() \ |
284 | BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > __SWP_TYPE_BITS) | 284 | BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > __SWP_TYPE_BITS) |
285 | 285 | ||
286 | /* | ||
287 | * Encode and decode a file entry. File entries are stored in the Linux | ||
288 | * page tables as follows: | ||
289 | * | ||
290 | * 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 | ||
291 | * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 | ||
292 | * <----------------------- offset ----------------------> 1 0 0 0 | ||
293 | */ | ||
294 | #define pte_file(pte) (pte_val(pte) & PTE_FILE) | ||
295 | #define pte_to_pgoff(x) (pte_val(x) >> 4) | ||
296 | #define pgoff_to_pte(x) __pte(((x) << 4) | PTE_FILE) | ||
297 | |||
298 | #define PTE_FILE_MAX_BITS 28 | ||
299 | |||
300 | /* Needs to be defined here and not in linux/mm.h, as it is arch dependent */ | 286 | /* Needs to be defined here and not in linux/mm.h, as it is arch dependent */ |
301 | /* FIXME: this is not correct */ | 287 | /* FIXME: this is not correct */ |
302 | #define kern_addr_valid(addr) (1) | 288 | #define kern_addr_valid(addr) (1) |