mm: make FIRST_USER_ADDRESS unsigned long on all archs

[cascardo/linux.git] / arch / m32r / include / asm / pgtable.h

diff --git a/arch/m32r/include/asm/pgtable.h b/arch/m32r/include/asm/pgtable.h
index 103ce67..8c1fb90 100644 (file)
--- a/arch/m32r/include/asm/pgtable.h
+++ b/arch/m32r/include/asm/pgtable.h
@@ -53,7 +53,7 @@ extern unsigned long empty_zero_page[1024];
 #define PGDIR_MASK     (~(PGDIR_SIZE - 1))
 
 #define USER_PTRS_PER_PGD      (TASK_SIZE / PGDIR_SIZE)
-#define FIRST_USER_ADDRESS     0
+#define FIRST_USER_ADDRESS     0UL
 
 #ifndef __ASSEMBLY__
 /* Just any arbitrary offset to the start of the vmalloc VM area: the
@@ -80,8 +80,6 @@ extern unsigned long empty_zero_page[1024];
  */
 
 #define _PAGE_BIT_DIRTY                0       /* software: page changed */
-#define _PAGE_BIT_FILE         0       /* when !present: nonlinear file
-                                          mapping */
 #define _PAGE_BIT_PRESENT      1       /* Valid: page is valid */
 #define _PAGE_BIT_GLOBAL       2       /* Global */
 #define _PAGE_BIT_LARGE                3       /* Large */
@@ -93,7 +91,6 @@ extern unsigned long empty_zero_page[1024];
 #define _PAGE_BIT_PROTNONE     9       /* software: if not present */
 
 #define _PAGE_DIRTY            (1UL << _PAGE_BIT_DIRTY)
-#define _PAGE_FILE             (1UL << _PAGE_BIT_FILE)
 #define _PAGE_PRESENT          (1UL << _PAGE_BIT_PRESENT)
 #define _PAGE_GLOBAL           (1UL << _PAGE_BIT_GLOBAL)
 #define _PAGE_LARGE            (1UL << _PAGE_BIT_LARGE)
@@ -206,14 +203,6 @@ static inline int pte_write(pte_t pte)
        return pte_val(pte) & _PAGE_WRITE;
 }
 
-/*
- * The following only works if pte_present() is not true.
- */
-static inline int pte_file(pte_t pte)
-{
-       return pte_val(pte) & _PAGE_FILE;
-}
-
 static inline int pte_special(pte_t pte)
 {
        return 0;