summaryrefslogtreecommitdiff
path: root/trap.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2017-08-29 14:11:59 -0400
committerRobert Morris <[email protected]>2017-08-29 14:11:59 -0400
commit4638cabf8c52c5f08f83942103f2375d2ed46388 (patch)
tree0ff969a00aac465b9c04866b41697bc3e775f815 /trap.c
parent164f4bae54286e1635b24efa03a1c565b9048b4a (diff)
downloadxv6-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.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/trap.c b/trap.c
index b5eba82..41c66eb 100644
--- a/trap.c
+++ b/trap.c
@@ -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