summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2001-10-01 22:50:30 +0000
committerjhb <jhb@FreeBSD.org>2001-10-01 22:50:30 +0000
commit57562e1667f1d5b94a421e68b8d165ac68b26d2f (patch)
treecaf1a28869a7570595d852b67d117f69b964293a /sys
parentfb7fca45bb10c6421ffce736c1dd5f7a75100d21 (diff)
downloadFreeBSD-src-57562e1667f1d5b94a421e68b8d165ac68b26d2f.zip
FreeBSD-src-57562e1667f1d5b94a421e68b8d165ac68b26d2f.tar.gz
Move the ap boot spin lock earlier in the lock order before the sio(4)
lock since we occasionally call printf() while holding the ap boot lock which can call down into the sio(4) driver if using a serial console.
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/subr_witness.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c
index e000aed..c984d22 100644
--- a/sys/kern/subr_witness.c
+++ b/sys/kern/subr_witness.c
@@ -197,9 +197,12 @@ static struct witness_order_list_entry order_lists[] = {
/*
* spin locks
*/
-#if defined(__i386__) && defined (SMP)
+#ifdef SMP
+ { "ap boot", &lock_class_mtx_spin },
+#ifdef __i386__
{ "com", &lock_class_mtx_spin },
#endif
+#endif
{ "sio", &lock_class_mtx_spin },
#ifdef __i386__
{ "cy", &lock_class_mtx_spin },
@@ -213,7 +216,6 @@ static struct witness_order_list_entry order_lists[] = {
* leaf locks
*/
#ifdef SMP
- { "ap boot", &lock_class_mtx_spin },
#ifdef __i386__
{ "imen", &lock_class_mtx_spin },
#endif
OpenPOWER on IntegriCloud