[ARM] Re-jig Linux PTE bits to allow room for 4 memory type bits

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index 8e21ef15bd743b9fb3b019bd7c9cc559c3c2ab61..5c75e02b3c7cd2f49ebb2e33c0c8f47102be0f9b 100644 (file)
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -166,10 +166,10 @@ extern void __pgd_error(const char *file, int line, unsigned long val);
 #define L_PTE_YOUNG            (1 << 1)
 #define L_PTE_BUFFERABLE       (1 << 2)        /* matches PTE */
 #define L_PTE_CACHEABLE                (1 << 3)        /* matches PTE */
-#define L_PTE_USER             (1 << 4)
-#define L_PTE_WRITE            (1 << 5)
-#define L_PTE_EXEC             (1 << 6)
-#define L_PTE_DIRTY            (1 << 7)
+#define L_PTE_DIRTY            (1 << 6)
+#define L_PTE_WRITE            (1 << 7)
+#define L_PTE_USER             (1 << 8)
+#define L_PTE_EXEC             (1 << 9)
 #define L_PTE_SHARED           (1 << 10)       /* shared(v6), coherent(xsc3) */
 
 #ifndef __ASSEMBLY__