diff options
author | bde <bde@FreeBSD.org> | 2002-01-30 18:23:31 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 2002-01-30 18:23:31 +0000 |
commit | 83b7c4d30a3f9613ef1f324e0184f7eb121b9139 (patch) | |
tree | 432dcbd686809149cac688e23fcb7e4d44a5c304 /sys | |
parent | 5909c8df4dc4ada0325629a022f8cb2fb883488e (diff) | |
download | FreeBSD-src-83b7c4d30a3f9613ef1f324e0184f7eb121b9139.zip FreeBSD-src-83b7c4d30a3f9613ef1f324e0184f7eb121b9139.tar.gz |
Backed out the last vestiges of rev.1.51. Don't enter a critical
region in Debugger(), since rev.1.468 of machdep.c does this better.
Other cosmetic backouts.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/amd64/db_interface.c | 11 | ||||
-rw-r--r-- | sys/i386/i386/db_interface.c | 11 |
2 files changed, 2 insertions, 20 deletions
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c index 000085b..bb5a5b1 100644 --- a/sys/amd64/amd64/db_interface.c +++ b/sys/amd64/amd64/db_interface.c @@ -33,9 +33,6 @@ #include <sys/systm.h> #include <sys/reboot.h> #include <sys/cons.h> -#include <sys/ktr.h> -#include <sys/linker_set.h> -#include <sys/lock.h> #include <sys/pcpu.h> #include <sys/proc.h> #include <sys/smp.h> @@ -49,9 +46,6 @@ #include <vm/pmap.h> #include <ddb/ddb.h> -#include <ddb/db_access.h> -#include <ddb/db_sym.h> -#include <ddb/db_variables.h> #include <machine/setjmp.h> @@ -311,8 +305,7 @@ void Debugger(msg) const char *msg; { - static volatile u_int in_Debugger; - critical_t savecrit; + static volatile u_int in_Debugger; /* * XXX @@ -324,10 +317,8 @@ Debugger(msg) return; if (atomic_cmpset_acq_int(&in_Debugger, 0, 1)) { - savecrit = cpu_critical_enter(); db_printf("Debugger(\"%s\")\n", msg); breakpoint(); - cpu_critical_exit(savecrit); atomic_store_rel_int(&in_Debugger, 0); } } diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c index 000085b..bb5a5b1 100644 --- a/sys/i386/i386/db_interface.c +++ b/sys/i386/i386/db_interface.c @@ -33,9 +33,6 @@ #include <sys/systm.h> #include <sys/reboot.h> #include <sys/cons.h> -#include <sys/ktr.h> -#include <sys/linker_set.h> -#include <sys/lock.h> #include <sys/pcpu.h> #include <sys/proc.h> #include <sys/smp.h> @@ -49,9 +46,6 @@ #include <vm/pmap.h> #include <ddb/ddb.h> -#include <ddb/db_access.h> -#include <ddb/db_sym.h> -#include <ddb/db_variables.h> #include <machine/setjmp.h> @@ -311,8 +305,7 @@ void Debugger(msg) const char *msg; { - static volatile u_int in_Debugger; - critical_t savecrit; + static volatile u_int in_Debugger; /* * XXX @@ -324,10 +317,8 @@ Debugger(msg) return; if (atomic_cmpset_acq_int(&in_Debugger, 0, 1)) { - savecrit = cpu_critical_enter(); db_printf("Debugger(\"%s\")\n", msg); breakpoint(); - cpu_critical_exit(savecrit); atomic_store_rel_int(&in_Debugger, 0); } } |