summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaroslav Tykhiy <ytykhiy@gmail.com>2006-06-20 12:44:21 +0000
committerYaroslav Tykhiy <ytykhiy@gmail.com>2006-06-20 12:44:21 +0000
commit15a901e26368e772e7d61d05b6f5bba4784bcdd8 (patch)
tree460eec9268c59d4fd1c7b2a6bf280ac4b7816a85
parentfb11be62a233fc2d1bf780be781456e1c4ad266a (diff)
Notes
-rw-r--r--sys/amd64/amd64/trap.c10
-rw-r--r--sys/i386/i386/trap.c4
2 files changed, 2 insertions, 12 deletions
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 9036317d2909..d41318cd4c6d 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -681,15 +681,9 @@ trap_fatal(frame, eva)
}
#ifdef KDB
- if (debugger_on_panic || kdb_active) {
- register_t rflags;
- rflags = intr_disable();
- if (kdb_trap(type, 0, frame)) {
- intr_restore(rflags);
+ if (debugger_on_panic || kdb_active)
+ if (kdb_trap(type, 0, frame))
return;
- }
- intr_restore(rflags);
- }
#endif
printf("trap number = %d\n", type);
if (type <= MAX_TRAP_MSG)
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 47a94fd899e3..cce7038a2543 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -856,16 +856,12 @@ trap_fatal(frame, eva)
#ifdef KDB
if (debugger_on_panic || kdb_active) {
- register_t eflags = intr_disable();
-
frame->tf_err = eva; /* smuggle fault address to ddb */
if (kdb_trap(type, 0, frame)) {
frame->tf_err = code; /* restore error code */
- intr_restore(eflags);
return;
}
frame->tf_err = code; /* restore error code */
- intr_restore(eflags);
}
#endif
printf("trap number = %d\n", type);