Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/include/asm-mips/addrspace.h b/include/asm-mips/addrspace.h
index c806eef41e7f8189e03808d8660bea61f9594298..a7d0d26e93c905ce59d501c75b75d9a208d420f5 100644 (file)
--- a/include/asm-mips/addrspace.h
+++ b/include/asm-mips/addrspace.h
@@ -10,7 +10,6 @@
 #ifndef _ASM_ADDRSPACE_H
 #define _ASM_ADDRSPACE_H
 
-#include <linux/config.h>
 #include <spaces.h>
 
 /*
@@ -162,6 +161,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>.