svn commit: r333200 - in stable/11/sys: amd64/amd64 i386/i386 powerpc/powerpc

[Andriy Gapon]

Author: avg
Date: Thu May  3 07:31:09 2018
New Revision: 333200
URL: https://svnweb.freebsd.org/changeset/base/333200

Log:
  MFC r332730: don't check for kdb reentry in trap_fatal(), it's impossible
  
  Sponsored by:	Panzura

Modified:
  stable/11/sys/amd64/amd64/trap.c
  stable/11/sys/i386/i386/trap.c
  stable/11/sys/powerpc/powerpc/trap.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/amd64/amd64/trap.c
==============================================================================
--- stable/11/sys/amd64/amd64/trap.c	Thu May  3 07:29:08 2018	(r333199)
+++ stable/11/sys/amd64/amd64/trap.c	Thu May  3 07:31:09 2018	(r333200)
@@ -808,7 +808,7 @@ trap_fatal(frame, eva)
 	    curproc->p_pid, curthread->td_name);
 
 #ifdef KDB
-	if (debugger_on_panic || kdb_active)
+	if (debugger_on_panic)
 		if (kdb_trap(type, 0, frame))
 			return;
 #endif

Modified: stable/11/sys/i386/i386/trap.c
==============================================================================
--- stable/11/sys/i386/i386/trap.c	Thu May  3 07:29:08 2018	(r333199)
+++ stable/11/sys/i386/i386/trap.c	Thu May  3 07:31:09 2018	(r333200)
@@ -944,7 +944,7 @@ trap_fatal(frame, eva)
 	    curproc->p_pid, curthread->td_name);
 
 #ifdef KDB
-	if (debugger_on_panic || kdb_active) {
+	if (debugger_on_panic) {
 		frame->tf_err = eva;	/* smuggle fault address to ddb */
 		if (kdb_trap(type, 0, frame)) {
 			frame->tf_err = code;	/* restore error code */

Modified: stable/11/sys/powerpc/powerpc/trap.c
==============================================================================
--- stable/11/sys/powerpc/powerpc/trap.c	Thu May  3 07:29:08 2018	(r333199)
+++ stable/11/sys/powerpc/powerpc/trap.c	Thu May  3 07:31:09 2018	(r333200)
@@ -392,8 +392,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));