diff -Naurp -X /home/jbarnes/dontdiff 081-cpu-startup-simulator-hacks.patch/arch/ia64/sn/io/sn2/ml_SN_init.c 082-hubinfo-simulator-hack.patch/arch/ia64/sn/io/sn2/ml_SN_init.c
--- 081-cpu-startup-simulator-hacks.patch/arch/ia64/sn/io/sn2/ml_SN_init.c	Sun Jan 25 18:29:51 2004
+++ 082-hubinfo-simulator-hack.patch/arch/ia64/sn/io/sn2/ml_SN_init.c	Thu Jan 29 10:33:06 2004
@@ -17,6 +17,7 @@
 #include <asm/sn/sn_private.h>
 #include <asm/sn/klconfig.h>
 #include <asm/sn/sn_cpuid.h>
+#include <asm/sn/simulator.h>
 
 int		maxcpus;
 
@@ -75,6 +76,8 @@ init_platform_hubinfo(nodepda_t **nodepd
 	nodepda_t *npda;
 	extern int numionodes;
 
+	if (IS_RUNNING_ON_SIMULATOR())
+		return;
 	for (cnode = 0; cnode < numionodes; cnode++) {
 		npda = nodepdaindr[cnode];
 		hubinfo = (hubinfo_t)npda->pdinfo;