patch-2.4.0-test12 linux/include/asm-mips64/sn/mapped_kernel.h

• Lines: 30
• Date: Tue Nov 28 21:42:04 2000
• Orig file: v2.4.0-test11/linux/include/asm-mips64/sn/mapped_kernel.h
• Orig date: Sun Jul 9 22:18:15 2000

diff -u --recursive --new-file v2.4.0-test11/linux/include/asm-mips64/sn/mapped_kernel.h linux/include/asm-mips64/sn/mapped_kernel.h
@@ -25,13 +25,27 @@
 
 #ifdef CONFIG_MAPPED_KERNEL
 
-#define MAPPED_KERN_RO_TO_PHYS(x)	(x - CKSSEG)
-#define MAPPED_KERN_RW_TO_PHYS(x)	(x - CKSSEG - 16777216)
+#define MAPPED_ADDR_RO_TO_PHYS(x)	(x - CKSSEG)
+#define MAPPED_ADDR_RW_TO_PHYS(x)	(x - CKSSEG - 16777216)
+
+#define MAPPED_KERN_RO_PHYSBASE(n) \
+			(PLAT_NODE_DATA(n)->kern_vars.kv_ro_baseaddr)
+#define MAPPED_KERN_RW_PHYSBASE(n) \
+			(PLAT_NODE_DATA(n)->kern_vars.kv_rw_baseaddr)
+
+#define MAPPED_KERN_RO_TO_PHYS(x) \
+				((unsigned long)MAPPED_ADDR_RO_TO_PHYS(x) | \
+				MAPPED_KERN_RO_PHYSBASE(get_compact_nodeid()))
+#define MAPPED_KERN_RW_TO_PHYS(x) \
+				((unsigned long)MAPPED_ADDR_RW_TO_PHYS(x) | \
+				MAPPED_KERN_RW_PHYSBASE(get_compact_nodeid()))
+#define MAPPED_OFFSET			16777216
 
 #else /* CONFIG_MAPPED_KERNEL */
 
 #define MAPPED_KERN_RO_TO_PHYS(x)	(x - CKSEG0)
 #define MAPPED_KERN_RW_TO_PHYS(x)	(x - CKSEG0)
+#define MAPPED_OFFSET			0
 
 #endif /* CONFIG_MAPPED_KERNEL */