diff options
author | Robert Morris <[email protected]> | 2010-08-31 19:21:52 -0400 |
---|---|---|
committer | Robert Morris <[email protected]> | 2010-08-31 19:21:52 -0400 |
commit | 23c3e52c2fb5f1709bf5053a8e93161931b56bf9 (patch) | |
tree | cb51f605a35de8980efce5dcab3e5df9757c022a /trap.c | |
parent | 3597d5dc704c192a85b9902f7264fe9025aad277 (diff) | |
parent | 5048762c7e27789a014cc1e74e1002e749c924ce (diff) | |
download | xv6-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.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; |