diff options
author | Robert Morris <[email protected]> | 2017-08-29 14:11:59 -0400 |
---|---|---|
committer | Robert Morris <[email protected]> | 2017-08-29 14:11:59 -0400 |
commit | 4638cabf8c52c5f08f83942103f2375d2ed46388 (patch) | |
tree | 0ff969a00aac465b9c04866b41697bc3e775f815 /trap.c | |
parent | 164f4bae54286e1635b24efa03a1c565b9048b4a (diff) | |
download | xv6-labs-4638cabf8c52c5f08f83942103f2375d2ed46388.tar.gz xv6-labs-4638cabf8c52c5f08f83942103f2375d2ed46388.tar.bz2 xv6-labs-4638cabf8c52c5f08f83942103f2375d2ed46388.zip |
fix runoff complaints about pagination and long lines
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 |