kernel: cleanup makefile for $CONF.$O target

[plan9front.git] / sys / src / 9 / pc / squidboy.c

diff --git a/sys/src/9/pc/squidboy.c b/sys/src/9/pc/squidboy.c
index 59301659524958191f8514c3678914dbe7ea65bb..7a3501221d49c112637e6abbf75afc88dbc43bbd 100644 (file)
--- a/sys/src/9/pc/squidboy.c
+++ b/sys/src/9/pc/squidboy.c
@@ -12,30 +12,17 @@ static void
 squidboy(Apic* apic)
 {
 //     iprint("Hello Squidboy\n");
-
        machinit();
        mmuinit();
-
        cpuidentify();
        cpuidprint();
-
+       syncclock();
+       active.machs[m->machno] = 1;
        apic->online = 1;
-       coherence();
-
        lapicinit(apic);
        lapiconline();
-       syncclock();
        timersinit();
-
        fpoff();
-
-       lock(&active);
-       active.machs |= 1<<m->machno;
-       unlock(&active);
-
-       while(!active.thunderbirdsarego)
-               microdelay(100);
-
        schedinit();
 }
 
@@ -107,10 +94,12 @@ mpstartap(Apic* apic)
 
        nvramwrite(0x0F, 0x0A);         /* shutdown code: warm reset upon init ipi */
        lapicstartap(apic, PADDR(APBOOTSTRAP));
-       for(i = 0; i < 1000; i++){
+       for(i = 0; i < 100000; i++){
+               if(arch->fastclock == tscticks)
+                       cycles(&m->tscticks);   /* for ap's syncclock(); */
                if(apic->online)
                        break;
-               delay(10);
+               delay(1);
        }
        nvramwrite(0x0F, 0x00);
 }