Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / um / include / asm / pgtable.h

diff --git a/arch/um/include/asm/pgtable.h b/arch/um/include/asm/pgtable.h
index ae02909a18752adebe5657aef42c620a629d3293..18eb9924dda382f08e8cb3cb5b88e0454d621c1e 100644 (file)
--- a/arch/um/include/asm/pgtable.h
+++ b/arch/um/include/asm/pgtable.h
@@ -18,7 +18,6 @@
 #define _PAGE_ACCESSED 0x080
 #define _PAGE_DIRTY    0x100
 /* If _PAGE_PRESENT is clear, we use these: */
-#define _PAGE_FILE     0x008   /* nonlinear file mapping, saved PTE; unset:swap */
 #define _PAGE_PROTNONE 0x010   /* if the user mapped it with PROT_NONE;
                                   pte_present gives true */
 
@@ -48,11 +47,7 @@ extern unsigned long end_iomem;
 #define VMALLOC_OFFSET (__va_space)
 #define VMALLOC_START ((end_iomem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
 #define PKMAP_BASE ((FIXADDR_START - LAST_PKMAP * PAGE_SIZE) & PMD_MASK)
-#ifdef CONFIG_HIGHMEM
-# define VMALLOC_END   (PKMAP_BASE-2*PAGE_SIZE)
-#else
-# define VMALLOC_END   (FIXADDR_START-2*PAGE_SIZE)
-#endif
+#define VMALLOC_END    (FIXADDR_START-2*PAGE_SIZE)
 #define MODULES_VADDR  VMALLOC_START
 #define MODULES_END    VMALLOC_END
 #define MODULES_LEN    (MODULES_VADDR - MODULES_END)
@@ -69,8 +64,6 @@ extern unsigned long end_iomem;
 #define PAGE_KERNEL    __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED)
 #define PAGE_KERNEL_EXEC       __pgprot(__PAGE_KERNEL_EXEC)
 
-#define io_remap_pfn_range     remap_pfn_range
-
 /*
  * The i386 can't do page protection for execute, and considers that the same
  * are read.
@@ -153,14 +146,6 @@ static inline int pte_write(pte_t pte)
               !(pte_get_bits(pte, _PAGE_PROTNONE)));
 }
 
-/*
- * The following only works if pte_present() is not true.
- */
-static inline int pte_file(pte_t pte)
-{
-       return pte_get_bits(pte, _PAGE_FILE);
-}
-
 static inline int pte_dirty(pte_t pte)
 {
        return pte_get_bits(pte, _PAGE_DIRTY);