summaryrefslogtreecommitdiffstats
path: root/sys/amd64/amd64/trap.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/amd64/amd64/trap.c')
-rw-r--r--sys/amd64/amd64/trap.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 3d35483..e672368 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
- * $Id: trap.c,v 1.130 1998/12/06 00:03:30 archie Exp $
+ * $Id: trap.c,v 1.131 1998/12/16 15:21:50 bde Exp $
*/
/*
@@ -93,6 +93,10 @@
#include <machine/vm86.h>
#endif
+#ifdef DDB
+ extern int in_Debugger, debugger_on_panic;
+#endif
+
#include "isa.h"
#include "npx.h"
@@ -901,7 +905,7 @@ trap_fatal(frame, eva)
return;
#endif
#ifdef DDB
- if (kdb_trap (type, 0, frame))
+ if ((debugger_on_panic || in_Debugger) && kdb_trap(type, 0, frame))
return;
#endif
printf("trap number = %d\n", type);
OpenPOWER on IntegriCloud