vserver 1.9.5.x5

[linux-2.6.git] / include / asm-ppc / mmu.h

diff --git a/include/asm-ppc/mmu.h b/include/asm-ppc/mmu.h
index 7bf3a4d..4d1d4fa 100644 (file)
--- a/include/asm-ppc/mmu.h
+++ b/include/asm-ppc/mmu.h
@@ -401,18 +401,17 @@ typedef struct _P601_BAT {
  * Freescale Book-E MMU support
  */
 
-#define MAS0_TLBSEL    0x10000000
-#define MAS0_ESEL      0x000F0000
-#define MAS0_NV                0x00000001
+#define MAS0_TLBSEL(x) ((x << 28) & 0x30000000)
+#define MAS0_ESEL(x)   ((x << 16) & 0x0FFF0000)
+#define MAS0_NV                0x00000FFF
 
 #define MAS1_VALID     0x80000000
 #define MAS1_IPROT     0x40000000
-#define MAS1_TID       0x03FF0000
+#define MAS1_TID(x)    ((x << 16) & 0x3FFF0000)
 #define MAS1_TS                0x00001000
-#define MAS1_TSIZE(x)  (x << 8)
+#define MAS1_TSIZE(x)  ((x << 8) & 0x00000F00)
 
 #define MAS2_EPN       0xFFFFF000
-#define MAS2_SHAREN    0x00000200
 #define MAS2_X0                0x00000040
 #define MAS2_X1                0x00000020
 #define MAS2_W         0x00000010
@@ -433,10 +432,9 @@ typedef struct _P601_BAT {
 #define MAS3_UR                0x00000002
 #define MAS3_SR                0x00000001
 
-#define MAS4_TLBSELD   0x10000000
-#define MAS4_TIDDSEL   0x00030000
-#define MAS4_DSHAREN   0x00001000
-#define MAS4_TSIZED(x) (x << 8)
+#define MAS4_TLBSELD(x) MAS0_TLBSEL(x)
+#define MAS4_TIDDSEL   0x000F0000
+#define MAS4_TSIZED(x) MAS1_TSIZE(x)
 #define MAS4_X0D       0x00000040
 #define MAS4_X1D       0x00000020
 #define MAS4_WD                0x00000010
@@ -445,8 +443,12 @@ typedef struct _P601_BAT {
 #define MAS4_GD                0x00000002
 #define MAS4_ED                0x00000001
 
-#define MAS6_SPID      0x00FF0000
+#define MAS6_SPID0     0x3FFF0000
+#define MAS6_SPID1     0x00007FFE
 #define MAS6_SAS       0x00000001
+#define MAS6_SPID      MAS6_SPID0
+
+#define MAS7_RPN       0xFFFFFFFF
 
 #endif /* _PPC_MMU_H_ */
 #endif /* __KERNEL__ */