===== include/asm-ia64/sn/arch.h 1.11 vs edited =====
--- 1.11/include/asm-ia64/sn/arch.h	2004-10-11 13:04:12 -07:00
+++ edited/include/asm-ia64/sn/arch.h	2004-10-29 15:52:12 -07:00
@@ -27,12 +27,6 @@
 #define NASID_TO_COMPACT_NODEID(nasid)  (nasid_to_cnodeid(nasid))
 #define COMPACT_TO_NASID_NODEID(cnode)  (cnodeid_to_nasid(cnode))
 
-
-#define INVALID_NASID		((nasid_t)-1)
-#define INVALID_SLAB            (slabid_t)-1
-#define INVALID_MODULE		((moduleid_t)-1)
-#define	INVALID_PARTID		((partid_t)-1)
-
 extern void sn_flush_all_caches(long addr, long bytes);
 
 #endif /* _ASM_IA64_SN_ARCH_H */
===== include/asm-ia64/sn/sn_sal.h 1.15 vs edited =====
--- 1.15/include/asm-ia64/sn/sn_sal.h	2004-10-26 16:42:36 -07:00
+++ edited/include/asm-ia64/sn/sn_sal.h	2004-10-29 15:55:04 -07:00
@@ -16,6 +16,7 @@
 #include <asm/sal.h>
 #include <asm/sn/sn_cpuid.h>
 #include <asm/sn/arch.h>
+#include <asm/sn/geo.h>
 #include <asm/sn/nodepda.h>
 
 // SGI Specific Calls