Author: avg
Date: Thu May 3 07:37:49 2018
New Revision: 333202
URL: https://svnweb.freebsd.org/changeset/base/333202
Log:
follow-up to r333201 for powerpc, no kdb_active check in trap_fatal
This is a direct commit as there are two copies of trap_fatal for
powerpc in this branch.
Sponsored by: Panzura
Modified:
stable/10/sys/powerpc/aim/trap.c
stable/10/sys/powerpc/booke/trap.c
Modified: stable/10/sys/powerpc/aim/trap.c
==============================================================================
--- stable/10/sys/powerpc/aim/trap.c Thu May 3 07:34:10 2018
(r333201)
+++ stable/10/sys/powerpc/aim/trap.c Thu May 3 07:37:49 2018
(r333202)
@@ -360,8 +360,7 @@ trap_fatal(struct trapframe *frame)
printtrap(frame->exc, frame, 1, (frame->srr1 & PSL_PR));
#ifdef KDB
- if ((debugger_on_panic || kdb_active) &&
- kdb_trap(frame->exc, 0, frame))
+ if (debugger_on_panic && kdb_trap(frame->exc, 0, frame))
return;
#endif
panic("%s trap", trapname(frame->exc));
Modified: stable/10/sys/powerpc/booke/trap.c
==============================================================================
--- stable/10/sys/powerpc/booke/trap.c Thu May 3 07:34:10 2018
(r333201)
+++ stable/10/sys/powerpc/booke/trap.c Thu May 3 07:37:49 2018
(r333202)
@@ -242,8 +242,7 @@ trap_fatal(struct trapframe *frame)
printtrap(frame->exc, frame, 1, (frame->srr1 & PSL_PR));
#ifdef KDB
- if ((debugger_on_panic || kdb_active) &&
- kdb_trap(frame->exc, 0, frame))
+ if (debugger_on_panic && kdb_trap(frame->exc, 0, frame))
return;
#endif
panic("%s trap", trapname(frame->exc));
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
