passes both usertests

exit had acquire where I meant release
swtch now checks that you hold no locks

1 files changed, 4 insertions, 0 deletions

diff --git a/trap.c b/trap.c
index 862225b..6f5409b 100644
--- a/trap.c
+++ b/trap.c
@@ -62,6 +62,9 @@ trap(struct Trapframe *tf)
     struct proc *cp = curproc[cpu()];
     lapic_timerintr();
     if(cp){
+      if(cpus[cpu()].clis != 0)
+        panic("trap clis > 0");
+      cpus[cpu()].clis += 1;
       sti();
       if(cp->killed)
         proc_exit();
@@ -69,6 +72,7 @@ trap(struct Trapframe *tf)
     }
     return;
   }
+
   if(v == (IRQ_OFFSET + IRQ_IDE)){
     ide_intr();
     return;