diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2015-02-10 17:11:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 17:30:33 -0500 |
commit | eb12f4872a3845a8803f689646dea5b92a30aff7 (patch) | |
tree | adfdbae6f4bd9336682e37c21624c32f00dfab88 /arch/tile | |
parent | 6a8c4820895cf1dd2a128aef67ce079ba6eded80 (diff) |
tile: 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>
Acked-by: Chris Metcalf <cmetcalf@ezchip.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/tile')
-rw-r--r-- | arch/tile/include/asm/pgtable.h | 11 | ||||
-rw-r--r-- | arch/tile/mm/homecache.c | 4 |
2 files changed, 0 insertions, 15 deletions
diff --git a/arch/tile/include/asm/pgtable.h b/arch/tile/include/asm/pgtable.h index 5d1950788c69..bc75b6ef2e79 100644 --- a/arch/tile/include/asm/pgtable.h +++ b/arch/tile/include/asm/pgtable.h | |||
@@ -285,17 +285,6 @@ extern void start_mm_caching(struct mm_struct *mm); | |||
285 | extern void check_mm_caching(struct mm_struct *prev, struct mm_struct *next); | 285 | extern void check_mm_caching(struct mm_struct *prev, struct mm_struct *next); |
286 | 286 | ||
287 | /* | 287 | /* |
288 | * Support non-linear file mappings (see sys_remap_file_pages). | ||
289 | * This is defined by CLIENT1 set but CLIENT0 and _PAGE_PRESENT clear, and the | ||
290 | * file offset in the 32 high bits. | ||
291 | */ | ||
292 | #define _PAGE_FILE HV_PTE_CLIENT1 | ||
293 | #define PTE_FILE_MAX_BITS 32 | ||
294 | #define pte_file(pte) (hv_pte_get_client1(pte) && !hv_pte_get_client0(pte)) | ||
295 | #define pte_to_pgoff(pte) ((pte).val >> 32) | ||
296 | #define pgoff_to_pte(off) ((pte_t) { (((long long)(off)) << 32) | _PAGE_FILE }) | ||
297 | |||
298 | /* | ||
299 | * Encode and de-code a swap entry (see <linux/swapops.h>). | 288 | * Encode and de-code a swap entry (see <linux/swapops.h>). |
300 | * We put the swap file type+offset in the 32 high bits; | 289 | * We put the swap file type+offset in the 32 high bits; |
301 | * I believe we can just leave the low bits clear. | 290 | * I believe we can just leave the low bits clear. |
diff --git a/arch/tile/mm/homecache.c b/arch/tile/mm/homecache.c index cd3387370ebb..0029b3fb651b 100644 --- a/arch/tile/mm/homecache.c +++ b/arch/tile/mm/homecache.c | |||
@@ -263,10 +263,6 @@ static int pte_to_home(pte_t pte) | |||
263 | /* Update the home of a PTE if necessary (can also be used for a pgprot_t). */ | 263 | /* Update the home of a PTE if necessary (can also be used for a pgprot_t). */ |
264 | pte_t pte_set_home(pte_t pte, int home) | 264 | pte_t pte_set_home(pte_t pte, int home) |
265 | { | 265 | { |
266 | /* Check for non-linear file mapping "PTEs" and pass them through. */ | ||
267 | if (pte_file(pte)) | ||
268 | return pte; | ||
269 | |||
270 | #if CHIP_HAS_MMIO() | 266 | #if CHIP_HAS_MMIO() |
271 | /* Check for MMIO mappings and pass them through. */ | 267 | /* Check for MMIO mappings and pass them through. */ |
272 | if (hv_pte_get_mode(pte) == HV_PTE_MODE_MMIO) | 268 | if (hv_pte_get_mode(pte) == HV_PTE_MODE_MMIO) |