From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 17 Oct 2001 22:53:48 +0000 (+0000)
Subject: irix-first-pass-at-ip35-support-20011017
X-Git-Tag: openafs-devel-1_3_0~194
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f5d36b1c7094a8a2c74ceb292e8ef84a894236fc;p=packages%2Fo%2Fopenafs.git

irix-first-pass-at-ip35-support-20011017


based on extensive feedback from Forest Godfrey and Michael Raymond
of SGI
---

diff --git a/src/afs/IRIX/osi_misc.c b/src/afs/IRIX/osi_misc.c
index 6e63cc129..560e26e75 100644
--- a/src/afs/IRIX/osi_misc.c
+++ b/src/afs/IRIX/osi_misc.c
@@ -51,14 +51,16 @@ int afs_init_kernel_config(int flag)
 	    inventory_t *pinv;
 	    /* test for numa arch. */
 	    /* Determine if thisis a NUMA platform. Currently, this is true
-	     * only if it's an IP27.
+	     * only if it's an IP27 or IP35.
 	     */
 	    pinv = find_inventory((inventory_t*)NULL, INV_PROCESSOR,
 				  INV_CPUBOARD, -1, -1, -1);
 	    if (!pinv)
 		code = ENODEV;
-	    else
-		afs_is_numa_arch = (pinv->inv_state == INV_IP27BOARD) ? 1 : 0;
+	    else 
+		afs_is_numa_arch = ((pinv->inv_state == INV_IP27BOARD) || 
+				    (pinv->inv_state == INV_IP35BOARD)) 
+		  ? 1 : 0;
 	}
 	else
 	    afs_is_numa_arch = flag;
@@ -85,6 +87,8 @@ int afs_ipno = 27;
 int afs_ipno = 28;
 #elif defined(IP30)
 int afs_ipno = 30;
+#elif defined(IP35)
+int afs_ipno = 35;
 #else
 int afs_ipno = -1;
 #endif
diff --git a/src/libafs/MakefileProto.IRIX.in b/src/libafs/MakefileProto.IRIX.in
index 6e3aaa341..758385e71 100644
--- a/src/libafs/MakefileProto.IRIX.in
+++ b/src/libafs/MakefileProto.IRIX.in
@@ -197,6 +197,12 @@ IP28_KDEFS = -DIP28 -DR10000 -DSCACHE_SET_ASSOC=2 -D_NO_UNCACHED_MEM_WAR \
 	-TARG:t5_no_spec_stores $(KDEFS_64)
 IP30_KDEFS = -DIP30 -DR10000 -DMP -DCELL_PREPARE -DBHV_PREPARE \
 	-TARG:processor=r10000 $(KDEFS_64)
+IP35_KDEFS =  -DIP35 -DR10000 -DMP -DSN -DSN1 -DMAPPED_KERNEL \
+	-DLARGE_CPU_COUNT \
+	-DPTE_64BIT -DULI -DCKPT -DMIPS4_ISA -DR10K_LLSC_WAR -DNUMA_BASE \
+	-DNUMA_PM  -DNUMA_TBORROW -DNUMA_MIGR_CONTROL -DNUMA_REPLICATION \
+	-DNUMA_REPL_CONTROL -DNUMA_SCHED -DCELL_PREPARE -DBHV_PREPARE \
+	-TARG:processor=r10000 $(KDEFS_64)
 # Loader flags
 LDFLAGS_64 = -64
 LDFLAGS_32 = -n32
@@ -225,7 +231,7 @@ PROCESSORS = R5000 R1000
 <sgi_64>
 PROCESSORS = R10000
 <sgi_65>
-PROCESSORS = IP19 IP20 IP21 IP25 IP26 IP27 IP28 IP30
+PROCESSORS = IP19 IP20 IP21 IP25 IP26 IP27 IP28 IP30 IP35
 <all>
 
 KOBJ = STATIC MODLOAD