Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2...

[linux-2.6] / include / asm-mips / addrspace.h

diff --git a/include/asm-mips/addrspace.h b/include/asm-mips/addrspace.h
index c806eef41e7f8189e03808d8660bea61f9594298..1386af1cb7d9f08153a028f2392d636015cc3568 100644 (file)
--- a/include/asm-mips/addrspace.h
+++ b/include/asm-mips/addrspace.h
@@ -129,6 +129,7 @@
 #if defined (CONFIG_CPU_R4300)                                         \
     || defined (CONFIG_CPU_R4X00)                                      \
     || defined (CONFIG_CPU_R5000)                                      \
+    || defined (CONFIG_CPU_RM7000)                                     \
     || defined (CONFIG_CPU_NEVADA)                                     \
     || defined (CONFIG_CPU_TX49XX)                                     \
     || defined (CONFIG_CPU_MIPS64)
@@ -162,6 +163,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>.