Merge branch 'net-dev'. See body of commit for details.
[akaros.git] / kern / arch / i386 / trap.c
index 37279ef..899b479 100644 (file)
@@ -275,10 +275,17 @@ irq_handler(trapframe_t *tf)
        // All others are LAPIC (timer, IPIs, perf, non-ExtINT LINTS, etc)
        // For now, only 235-255 are available
        assert(tf->tf_trapno >= 32); // slows us down, but we should never have this
+       
+       lapic_send_eoi();
+       
+       /*
+       //Old PIC relatd code. Should be gone for good, but leaving it just incase.
        if (tf->tf_trapno < 48)
                pic_send_eoi(tf->tf_trapno - PIC1_OFFSET);
        else
                lapic_send_eoi();
+       */
+
 }
 
 void