diff -Naurp -X /home/jbarnes/dontdiff 080-ide-simulator-hacks.patch/init/main.c 081-cpu-startup-simulator-hacks.patch/init/main.c
--- 080-ide-simulator-hacks.patch/init/main.c	Thu Jan 29 10:18:58 2004
+++ 081-cpu-startup-simulator-hacks.patch/init/main.c	Thu Jan 29 10:33:05 2004
@@ -39,6 +39,10 @@
 #include <linux/writeback.h>
 #include <linux/cpu.h>
 #include <linux/efi.h>
+#ifdef CONFIG_IA64_SGI_SN_SIM
+#include <asm/sn/simulator.h>
+#endif
+
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -179,6 +183,11 @@ void __init calibrate_delay(void)
 	unsigned long ticks, loopbit;
 	int lps_precision = LPS_PREC;
 
+#ifdef CONFIG_IA64_SGI_SN_SIM
+	if (IS_RUNNING_ON_SIMULATOR() && smp_processor_id() > 0)
+		return;
+#endif
+
 	loops_per_jiffy = (1<<12);
 
 	printk("Calibrating delay loop... ");