Don't enable interrupts for a kernel breakpoint or trace trap. Otherwise,

this negates the explicit disabling of interrupts when entering the
debugger in Debugger().

3 files changed, 21 insertions, 18 deletions

diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 40681bd..b4373b3 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -254,18 +254,19 @@ trap(frame)
 			printf(
 			    "pid %ld (%s): trap %d with interrupts disabled\n",
 			    (long)curproc->p_pid, curproc->p_comm, type);
-		else if (type != T_BPTFLT && type != T_TRCTRAP)
+		else if (type != T_BPTFLT && type != T_TRCTRAP) {
 			/*
 			 * XXX not quite right, since this may be for a
 			 * multiple fault in user mode.
 			 */
 			printf("kernel trap %d with interrupts disabled\n",
 			    type);
-		/*
-		 * We should walk p_heldmtx here and see if any are
-		 * spin mutexes, and not do this if so.
-		 */
-		enable_intr();
+			/*
+			 * We should walk p_heldmtx here and see if any are
+			 * spin mutexes, and not do this if so.
+			 */
+			enable_intr();
+		}
 	}
 
 	eva = 0;
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 40681bd..b4373b3 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -254,18 +254,19 @@ trap(frame)
 			printf(
 			    "pid %ld (%s): trap %d with interrupts disabled\n",
 			    (long)curproc->p_pid, curproc->p_comm, type);
-		else if (type != T_BPTFLT && type != T_TRCTRAP)
+		else if (type != T_BPTFLT && type != T_TRCTRAP) {
 			/*
 			 * XXX not quite right, since this may be for a
 			 * multiple fault in user mode.
 			 */
 			printf("kernel trap %d with interrupts disabled\n",
 			    type);
-		/*
-		 * We should walk p_heldmtx here and see if any are
-		 * spin mutexes, and not do this if so.
-		 */
-		enable_intr();
+			/*
+			 * We should walk p_heldmtx here and see if any are
+			 * spin mutexes, and not do this if so.
+			 */
+			enable_intr();
+		}
 	}
 
 	eva = 0;
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 40681bd..b4373b3 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -254,18 +254,19 @@ trap(frame)
 			printf(
 			    "pid %ld (%s): trap %d with interrupts disabled\n",
 			    (long)curproc->p_pid, curproc->p_comm, type);
-		else if (type != T_BPTFLT && type != T_TRCTRAP)
+		else if (type != T_BPTFLT && type != T_TRCTRAP) {
 			/*
 			 * XXX not quite right, since this may be for a
 			 * multiple fault in user mode.
 			 */
 			printf("kernel trap %d with interrupts disabled\n",
 			    type);
-		/*
-		 * We should walk p_heldmtx here and see if any are
-		 * spin mutexes, and not do this if so.
-		 */
-		enable_intr();
+			/*
+			 * We should walk p_heldmtx here and see if any are
+			 * spin mutexes, and not do this if so.
+			 */
+			enable_intr();
+		}
 	}
 
 	eva = 0;