Index: linux/init/main.c
===================================================================
--- linux.orig/init/main.c	Thu Jun 10 14:48:02 2004
+++ linux/init/main.c	Thu Jun 10 14:51:40 2004
@@ -65,6 +65,10 @@
 #include <linux/kdb.h>
 #endif	/* CONFIG_KDB */
 
+#ifdef CONFIG_IA64_SGI_SN_SIM
+#include <asm/sn/simulator.h>
+#endif
+
 /*
  * Versions of gcc older than that listed below may actually compile
  * and link okay, but the end product can have subtle run time bugs.
@@ -205,6 +209,11 @@ void __devinit 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... ");