small cleanup to trap.c and ioapic.c; add a bit more info to the multiple irq botch message. Reference: /n/atom/patch/applied2013/fsmirqbotch Date: Tue Aug 27 23:25:29 CES 2013 Signed-off-by: quanstro@quanstro.net --- /sys/src/fs/amd64/trap.c Tue Aug 27 23:25:02 2013 +++ /sys/src/fs/amd64/trap.c Tue Aug 27 23:25:02 2013 @@ -335,7 +335,7 @@ return; } iprint("dumpstack\n"); -prflush(); + prflush(); iprint("ktrace 9%s %#p %#p\n", "iveyfs", ureg->ip, ureg->sp); i = 0; if(u != nil @@ -353,7 +353,7 @@ return; } iprint("estackx %#p\n", estack); -prflush(); + prflush(); for(l = (uintptr)&l; l < estack; l += sizeof(uintptr)){ v = *(uintptr*)l; if((KTZERO < v && v < (uintptr)&etext) @@ -370,7 +370,7 @@ } if(i) iprint("\n"); -prflush(); + prflush(); } void --- /sys/src/fs/amd64/ioapic.c Tue Aug 27 23:25:02 2013 +++ /sys/src/fs/amd64/ioapic.c Tue Aug 27 23:25:02 2013 @@ -163,8 +163,8 @@ rdt->lo = lo; }else{ if(lo != rdt->lo){ - print("mutiple irq botch bus %d %d/%d/%d lo %.8ux vs %.8ux\n", - busno, apicno, intin, devno, lo, rdt->lo); + print("mutiple irq botch type %d bus %d %d/%d/%d lo %.8ux vs %.8ux type %d\n", + bustype, busno, apicno, intin, devno, lo, rdt->lo rdt->bustype); return; } DBG("dup rdt %d %d %d %d %.8ux\n", busno, apicno, intin, devno, lo);