1 files changed, 14 insertions, 25 deletions

diff --git a/arch/arc/include/asm/pgtable.h b/arch/arc/include/asm/pgtable.h
index 4749a0eee1cf..99799c91ca00 100644
--- a/arch/arc/include/asm/pgtable.h
+++ b/arch/arc/include/asm/pgtable.h
@@ -57,27 +57,21 @@
 
 #define _PAGE_ACCESSED      (1<<1)      /* Page is accessed (S) */
 #define _PAGE_CACHEABLE     (1<<2)      /* Page is cached (H) */
-#define _PAGE_U_EXECUTE     (1<<3)      /* Page has user execute perm (H) */
-#define _PAGE_U_WRITE       (1<<4)      /* Page has user write perm (H) */
-#define _PAGE_U_READ        (1<<5)      /* Page has user read perm (H) */
-#define _PAGE_K_EXECUTE     (1<<6)      /* Page has kernel execute perm (H) */
-#define _PAGE_K_WRITE       (1<<7)      /* Page has kernel write perm (H) */
-#define _PAGE_K_READ        (1<<8)      /* Page has kernel perm (H) */
+#define _PAGE_EXECUTE       (1<<3)      /* Page has user execute perm (H) */
+#define _PAGE_WRITE         (1<<4)      /* Page has user write perm (H) */
+#define _PAGE_READ          (1<<5)      /* Page has user read perm (H) */
 #define _PAGE_GLOBAL        (1<<9)      /* Page is global (H) */
 #define _PAGE_MODIFIED      (1<<10)     /* Page modified (dirty) (S) */
 #define _PAGE_FILE          (1<<10)     /* page cache/ swap (S) */
 #define _PAGE_PRESENT       (1<<11)     /* TLB entry is valid (H) */
 
-#else
+#else   /* MMU v3 onwards */
 
 /* PD1 */
 #define _PAGE_CACHEABLE     (1<<0)      /* Page is cached (H) */
-#define _PAGE_U_EXECUTE     (1<<1)      /* Page has user execute perm (H) */
-#define _PAGE_U_WRITE       (1<<2)      /* Page has user write perm (H) */
-#define _PAGE_U_READ        (1<<3)      /* Page has user read perm (H) */
-#define _PAGE_K_EXECUTE     (1<<4)      /* Page has kernel execute perm (H) */
-#define _PAGE_K_WRITE       (1<<5)      /* Page has kernel write perm (H) */
-#define _PAGE_K_READ        (1<<6)      /* Page has kernel perm (H) */
+#define _PAGE_EXECUTE       (1<<1)      /* Page has user execute perm (H) */
+#define _PAGE_WRITE         (1<<2)      /* Page has user write perm (H) */
+#define _PAGE_READ          (1<<3)      /* Page has user read perm (H) */
 #define _PAGE_ACCESSED      (1<<7)      /* Page is accessed (S) */
 
 /* PD0 */
@@ -92,8 +86,8 @@
 #define _PAGE_SHARED_CODE_H (1<<31)     /* Hardware counterpart of above */
 #endif
 
-/* Kernel allowed all permissions for all pages */
-#define _K_PAGE_PERMS  (_PAGE_K_EXECUTE | _PAGE_K_WRITE | _PAGE_K_READ | \
+/* vmalloc permissions */
+#define _K_PAGE_PERMS  (_PAGE_EXECUTE | _PAGE_WRITE | _PAGE_READ | \
                         _PAGE_GLOBAL | _PAGE_PRESENT)
 
 #ifdef CONFIG_ARC_CACHE_PAGES
@@ -109,10 +103,6 @@
  */
 #define ___DEF (_PAGE_PRESENT | _PAGE_DEF_CACHEABLE)
 
-#define _PAGE_READ      (_PAGE_U_READ    | _PAGE_K_READ)
-#define _PAGE_WRITE     (_PAGE_U_WRITE   | _PAGE_K_WRITE)
-#define _PAGE_EXECUTE   (_PAGE_U_EXECUTE | _PAGE_K_EXECUTE)
-
 /* Set of bits not changed in pte_modify */
 #define _PAGE_CHG_MASK  (PAGE_MASK | _PAGE_ACCESSED | _PAGE_MODIFIED)
 
@@ -126,8 +116,8 @@
 
 #define PAGE_SHARED     PAGE_U_W_R
 
-/* While kernel runs out of unstrslated space, vmalloc/modules use a chunk of
- * kernel vaddr space - visible in all addr spaces, but kernel mode only
+/* While kernel runs out of unstranslated space, vmalloc/modules use a chunk of
+ * user vaddr space - visible in all addr spaces, but kernel mode only
  * Thus Global, all-kernel-access, no-user-access, cached
  */
 #define PAGE_KERNEL          __pgprot(_K_PAGE_PERMS | _PAGE_DEF_CACHEABLE)
@@ -136,10 +126,9 @@
 #define PAGE_KERNEL_NO_CACHE __pgprot(_K_PAGE_PERMS)
 
 /* Masks for actual TLB "PD"s */
-#define PTE_BITS_IN_PD0 (_PAGE_GLOBAL | _PAGE_PRESENT)
-#define PTE_BITS_IN_PD1 (PAGE_MASK | _PAGE_CACHEABLE | \
-                         _PAGE_U_EXECUTE | _PAGE_U_WRITE | _PAGE_U_READ | \
-                         _PAGE_K_EXECUTE | _PAGE_K_WRITE | _PAGE_K_READ)
+#define PTE_BITS_IN_PD0         (_PAGE_GLOBAL | _PAGE_PRESENT)
+#define PTE_BITS_RWX            (_PAGE_EXECUTE | _PAGE_WRITE | _PAGE_READ)
+#define PTE_BITS_NON_RWX_IN_PD1 (PAGE_MASK | _PAGE_CACHEABLE)
 
 /**************************************************************************
  * Mapping of vm_flags (Generic VM) to PTE flags (arch specific)