diff options
Diffstat (limited to 'trap.c')
-rw-r--r-- | trap.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -89,8 +89,8 @@ trap(struct trapframe *tf) // In user space, assume process misbehaved. cprintf("pid %d %s: trap %d err %d on cpu %d " "eip 0x%x addr 0x%x--kill proc\n", - myproc()->pid, myproc()->name, tf->trapno, tf->err, cpuid(), tf->eip, - rcr2()); + myproc()->pid, myproc()->name, tf->trapno, + tf->err, cpuid(), tf->eip, rcr2()); myproc()->killed = 1; } @@ -102,7 +102,8 @@ trap(struct trapframe *tf) // Force process to give up CPU on clock tick. // If interrupts were on while locks held, would need to check nlock. - if(myproc() && myproc()->state == RUNNING && tf->trapno == T_IRQ0+IRQ_TIMER) + if(myproc() && myproc()->state == RUNNING && + tf->trapno == T_IRQ0+IRQ_TIMER) yield(); // Check if the process has been killed since we yielded |