| From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> |
| Date: Tue, 10 Feb 2015 14:11:14 -0800 |
| Subject: tile: drop pte_file()-related helpers |
| |
| commit eb12f4872a3845a8803f689646dea5b92a30aff7 upstream. |
| |
| 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> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/tile/include/asm/pgtable.h | 11 ----------- |
| arch/tile/mm/homecache.c | 4 ---- |
| 2 files changed, 15 deletions(-) |
| |
| --- 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_s |
| extern void check_mm_caching(struct mm_struct *prev, struct mm_struct *next); |
| |
| /* |
| - * Support non-linear file mappings (see sys_remap_file_pages). |
| - * This is defined by CLIENT1 set but CLIENT0 and _PAGE_PRESENT clear, and the |
| - * file offset in the 32 high bits. |
| - */ |
| -#define _PAGE_FILE HV_PTE_CLIENT1 |
| -#define PTE_FILE_MAX_BITS 32 |
| -#define pte_file(pte) (hv_pte_get_client1(pte) && !hv_pte_get_client0(pte)) |
| -#define pte_to_pgoff(pte) ((pte).val >> 32) |
| -#define pgoff_to_pte(off) ((pte_t) { (((long long)(off)) << 32) | _PAGE_FILE }) |
| - |
| -/* |
| * Encode and de-code a swap entry (see <linux/swapops.h>). |
| * We put the swap file type+offset in the 32 high bits; |
| * I believe we can just leave the low bits clear. |
| --- a/arch/tile/mm/homecache.c |
| +++ b/arch/tile/mm/homecache.c |
| @@ -265,10 +265,6 @@ static int pte_to_home(pte_t pte) |
| /* Update the home of a PTE if necessary (can also be used for a pgprot_t). */ |
| pte_t pte_set_home(pte_t pte, int home) |
| { |
| - /* Check for non-linear file mapping "PTEs" and pass them through. */ |
| - if (pte_file(pte)) |
| - return pte; |
| - |
| #if CHIP_HAS_MMIO() |
| /* Check for MMIO mappings and pass them through. */ |
| if (hv_pte_get_mode(pte) == HV_PTE_MODE_MMIO) |
