Module Name: src
Committed By: cliff
Date: Mon Nov 9 10:02:30 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: trap.c
Log Message:
- #if DDB call Debugger() before panic("trapsignal") for non-user trap
To generate a diff of this commit:
cvs rdiff -u -r1.217.12.9 -r1.217.12.10 src/sys/arch/mips/mips/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/trap.c
diff -u src/sys/arch/mips/mips/trap.c:1.217.12.9 src/sys/arch/mips/mips/trap.c:1.217.12.10
--- src/sys/arch/mips/mips/trap.c:1.217.12.9 Mon Sep 7 22:06:32 2009
+++ src/sys/arch/mips/mips/trap.c Mon Nov 9 10:02:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.217.12.9 2009/09/07 22:06:32 matt Exp $ */
+/* $NetBSD: trap.c,v 1.217.12.10 2009/11/09 10:02:30 cliff Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -78,7 +78,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.217.12.9 2009/09/07 22:06:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.217.12.10 2009/11/09 10:02:30 cliff Exp $");
#include "opt_cputype.h" /* which mips CPU levels do we support? */
#include "opt_ddb.h"
@@ -585,8 +585,12 @@
}
#endif
(*p->p_emul->e_trapsignal)(l, &ksi);
- if ((type & T_USER) == 0)
+ if ((type & T_USER) == 0) {
+#ifdef DDB
+ Debugger();
+#endif
panic("trapsignal");
+ }
userret(l);
return;
}
