X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-ia64%2Fsn%2Farch.h;h=bfc922a0ab717929cdcec7e98264738f30020fc4;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=0faf9d7dd9a8090ea826223e818e0c5e11dc4285;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/include/asm-ia64/sn/arch.h b/include/asm-ia64/sn/arch.h
index 0faf9d7dd..bfc922a0a 100644
--- a/include/asm-ia64/sn/arch.h
+++ b/include/asm-ia64/sn/arch.h
@@ -5,7 +5,7 @@
  *
  * SGI specific setup.
  *
- * Copyright (C) 1995-1997,1999,2001-2003 Silicon Graphics, Inc.  All rights reserved.
+ * Copyright (C) 1995-1997,1999,2001-2004 Silicon Graphics, Inc.  All rights reserved.
  * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org)
  */
 #ifndef _ASM_IA64_SN_ARCH_H
@@ -15,20 +15,14 @@
 #include <asm/sn/types.h>
 #include <asm/sn/sn_cpuid.h>
 
-typedef u64	shubreg_t;
-typedef u64	hubreg_t;
-typedef u64	mmr_t;
-typedef u64	nic_t;
-
-#define INVALID_NASID		((nasid_t)-1)
-#define INVALID_CNODEID		((cnodeid_t)-1)
-#define INVALID_PNODEID		((pnodeid_t)-1)
-#define INVALID_SLAB            (slabid_t)-1
-#define INVALID_MODULE		((moduleid_t)-1)
-#define	INVALID_PARTID		((partid_t)-1)
+/*
+ * This is the maximum number of nodes that can be part of a kernel.
+ * Effectively, it's the maximum number of compact node ids (cnodeid_t).
+ * This is not necessarily the same as MAX_NASIDS.
+ */
+#define MAX_COMPACT_NODES	2048
+#define CPUS_PER_NODE		4
 
-extern cpuid_t cnodetocpu(cnodeid_t);
 extern void sn_flush_all_caches(long addr, long bytes);
-extern int is_fine_dirmode(void);
 
 #endif /* _ASM_IA64_SN_ARCH_H */