2 files changed, 10 insertions(+), 2 deletions(-)

M pc/clock.c
M pc/mp.c

@@ 38,6 38,8 @@ clockintr(Ureg* ureg, void*)
 {
 	Clock0link *lp;
 
+	// this needs to be here for synchronizing mp clocks
+	// see mp.c's squidboy()
 	fastticks(nil);
 	m->ticks++;
 	if(m->proc)

@@ 351,6 351,8 @@ checkmtrr(void)
 static void
 squidboy(Apic* apic)
 {
+	ulong x;
+
 //	iprint("Hello Squidboy\n");
 
 	machinit();


@@ 367,8 369,12 @@ squidboy(Apic* apic)
 	/*
 	 * Restrain your octopus! Don't let it go out on the sea!
 	 */
-	while(MACHP(0)->ticks == 0)
-		wrmsr(0x10, MACHP(0)->fastclock); /* synchronize fast counters */
+	lock(&active);
+	x = MACHP(0)->ticks;
+	while(MACHP(0)->ticks == x)
+		;
+	wrmsr(0x10, MACHP(0)->fastclock); /* synchronize fast counters */
+	unlock(&active);
 
 	lapicinit(apic);
 	lapiconline();