Increment kdb_active after we stopped the other CPUs and decrement

kdb_active before we restart them. This avoids false positives on
restarted CPUs when they test for kdb_active while kdb_trap() is
still finishing up.

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c
index 7fb9b9e..e7b9a73 100644
--- a/sys/kern/subr_kdb.c
+++ b/sys/kern/subr_kdb.c
@@ -463,13 +463,13 @@ kdb_trap(int type, int code, struct trapframe *tf)
 
 	intr = intr_disable();
 
-	kdb_active++;
-
 #ifdef SMP
 	if ((did_stop_cpus = kdb_stop_cpus) != 0)
 		stop_cpus(PCPU_GET(other_cpus));
 #endif
 
+	kdb_active++;
+
 	kdb_frame = tf;
 
 	/* Let MD code do its thing first... */
@@ -480,13 +480,13 @@ kdb_trap(int type, int code, struct trapframe *tf)
 
 	handled = kdb_dbbe->dbbe_trap(type, code);
 
+	kdb_active--;
+
 #ifdef SMP
 	if (did_stop_cpus)
 		restart_cpus(stopped_cpus);
 #endif
 
-	kdb_active--;
-
 	intr_restore(intr);
 
 	return (handled);