summaryrefslogtreecommitdiff
path: root/trap.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2010-08-31 19:21:52 -0400
committerRobert Morris <[email protected]>2010-08-31 19:21:52 -0400
commit23c3e52c2fb5f1709bf5053a8e93161931b56bf9 (patch)
treecb51f605a35de8980efce5dcab3e5df9757c022a /trap.c
parent3597d5dc704c192a85b9902f7264fe9025aad277 (diff)
parent5048762c7e27789a014cc1e74e1002e749c924ce (diff)
downloadxv6-labs-23c3e52c2fb5f1709bf5053a8e93161931b56bf9.tar.gz
xv6-labs-23c3e52c2fb5f1709bf5053a8e93161931b56bf9.tar.bz2
xv6-labs-23c3e52c2fb5f1709bf5053a8e93161931b56bf9.zip
Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6
Diffstat (limited to 'trap.c')
-rw-r--r--trap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/trap.c b/trap.c
index daee22f..ae26739 100644
--- a/trap.c
+++ b/trap.c
@@ -83,7 +83,8 @@ trap(struct trapframe *tf)
panic("trap");
}
// 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",
+ cprintf("pid %d %s: trap %d err %d on cpu %d "
+ "eip 0x%x addr 0x%x--kill proc\n",
proc->pid, proc->name, tf->trapno, tf->err, cpu->id, tf->eip,
rcr2());
proc->killed = 1;