SUNRPC: Yet more RPC cleanups

[~andy/linux] / include / asm-mips / addrspace.h

diff --git a/include/asm-mips/addrspace.h b/include/asm-mips/addrspace.h
index a54cdd417956b42f767eec7b46fa0df9ba37efde..42520cc84b0f7d5074cb8e9fa6d08580b23099c4 100644 (file)
--- a/include/asm-mips/addrspace.h
+++ b/include/asm-mips/addrspace.h
@@ -131,7 +131,7 @@
     || defined (CONFIG_CPU_R5000)                                      \
     || defined (CONFIG_CPU_NEVADA)                                     \
     || defined (CONFIG_CPU_TX49XX)                                     \
-    || defined (CONFIG_CPU_MIPS64_R1)
+    || defined (CONFIG_CPU_MIPS64)
 #define KUSIZE         _LLCONST_(0x0000010000000000)   /* 2^^40 */
 #define KUSIZE_64      _LLCONST_(0x0000010000000000)   /* 2^^40 */
 #define K0SIZE         _LLCONST_(0x0000001000000000)   /* 2^^36 */
@@ -162,6 +162,16 @@
 #define TO_PHYS_MASK   _LLCONST_(0x000000ffffffffff)   /* 2^^40 - 1 */
 #endif
 
+#if defined(CONFIG_CPU_SB1) || defined(CONFIG_CPU_SB1A)
+#define KUSIZE         _LLCONST_(0x0000100000000000)   /* 2^^44 */
+#define KUSIZE_64      _LLCONST_(0x0000100000000000)   /* 2^^44 */
+#define K0SIZE         _LLCONST_(0x0000100000000000)   /* 2^^44 */
+#define K1SIZE         _LLCONST_(0x0000100000000000)   /* 2^^44 */
+#define K2SIZE         _LLCONST_(0x0000ffff80000000)
+#define KSEGSIZE       _LLCONST_(0x0000ffff80000000)   /* max syssegsz */
+#define TO_PHYS_MASK   _LLCONST_(0x00000fffffffffff)   /* 2^^44 - 1 */
+#endif
+
 /*
  * Further names for SGI source compatibility.  These are stolen from
  * IRIX's <sys/mips_addrspace.h>.