svn commit: r333201 - in stable/10/sys: amd64/amd64 i386/i386

[Andriy Gapon]

Author: avg
Date: Thu May  3 07:34:10 2018
New Revision: 333201
URL: https://svnweb.freebsd.org/changeset/base/333201

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

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

Modified: stable/10/sys/amd64/amd64/trap.c
==============================================================================
--- stable/10/sys/amd64/amd64/trap.c	Thu May  3 07:31:09 2018	(r333200)
+++ stable/10/sys/amd64/amd64/trap.c	Thu May  3 07:34:10 2018	(r333201)
@@ -849,7 +849,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/10/sys/i386/i386/trap.c
==============================================================================
--- stable/10/sys/i386/i386/trap.c	Thu May  3 07:31:09 2018	(r333200)
+++ stable/10/sys/i386/i386/trap.c	Thu May  3 07:34:10 2018	(r333201)
@@ -1018,7 +1018,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 */