diff options
| author | Peter Hessler <phessler@cvs.openbsd.org> | 2010-11-01 15:37:04 +0000 |
|---|---|---|
| committer | Peter Hessler <phessler@cvs.openbsd.org> | 2010-11-01 15:37:04 +0000 |
| commit | 349af04bba8320d85e9ac81c7936a74657d2dd7b (patch) | |
| tree | f54001043808e29cc973251c67c04807b916a954 /sys/arch/amd64 | |
| parent | fd7609552467858357d38874134d63f268d64dd6 (diff) | |
convert a trap that ends up in 'we_re_toast' from a boot(RB_HALT) into a
real panic. this brings amd64 inline with all of the other arches.
OK kettenis@, mikeb@, krw@, guenther@, thib@
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/trap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/amd64/amd64/trap.c b/sys/arch/amd64/amd64/trap.c index 4e3a2e06da8..ae0a48d6c2c 100644 --- a/sys/arch/amd64/amd64/trap.c +++ b/sys/arch/amd64/amd64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.20 2010/10/26 05:49:10 guenther Exp $ */ +/* $OpenBSD: trap.c,v 1.21 2010/11/01 15:37:03 phessler Exp $ */ /* $NetBSD: trap.c,v 1.2 2003/05/04 23:51:56 fvdl Exp $ */ /*- @@ -209,8 +209,8 @@ trap(struct trapframe *frame) type, frame->tf_err, (u_long)frame->tf_rip, frame->tf_cs, frame->tf_rflags, rcr2(), curcpu()->ci_ilevel, frame->tf_rsp); - /* panic("trap"); */ - boot(RB_HALT); + panic("trap type %d, code=%lx, pc=%lx", + type, frame->tf_err, frame->tf_rip); /*NOTREACHED*/ case T_PROTFLT: |