Page MenuHomeFreeBSD
Files F153805011

D39323.id.diff
No OneTemporary
Actions

D39323.id.diff
View Options

diff --git a/sys/dev/vt/vt_buf.c b/sys/dev/vt/vt_buf.c
--- a/sys/dev/vt/vt_buf.c
+++ b/sys/dev/vt/vt_buf.c
@@ -46,8 +46,8 @@
static MALLOC_DEFINE(M_VTBUF, "vtbuf", "vt buffer");
-#define VTBUF_LOCK(vb) mtx_lock_spin(&(vb)->vb_lock)
-#define VTBUF_UNLOCK(vb) mtx_unlock_spin(&(vb)->vb_lock)
+#define VTBUF_LOCK(vb) mtx_lock(&(vb)->vb_lock)
+#define VTBUF_UNLOCK(vb) mtx_unlock(&(vb)->vb_lock)
#define POS_INDEX(c, r) (((r) << 12) + (c))
#define POS_COPY(d, s) do { \
@@ -452,7 +452,7 @@
vtbuf_do_clearhistory(vb);
vtbuf_make_undirty(vb);
if ((vb->vb_flags & VBF_MTX_INIT) == 0) {
- mtx_init(&vb->vb_lock, "vtbuf", NULL, MTX_SPIN);
+ mtx_init(&vb->vb_lock, "vtbuf", NULL, MTX_DEF);
vb->vb_flags |= VBF_MTX_INIT;
}
}
diff --git a/sys/kern/subr_terminal.c b/sys/kern/subr_terminal.c
--- a/sys/kern/subr_terminal.c
+++ b/sys/kern/subr_terminal.c
@@ -57,26 +57,26 @@
*/
#define TERMINAL_LOCK(tm) do { \
if ((tm)->tm_flags & TF_CONS) \
- mtx_lock_spin(&(tm)->tm_mtx); \
+ mtx_lock(&(tm)->tm_mtx); \
else if ((tm)->tm_tty != NULL) \
tty_lock((tm)->tm_tty); \
} while (0)
#define TERMINAL_UNLOCK(tm) do { \
if ((tm)->tm_flags & TF_CONS) \
- mtx_unlock_spin(&(tm)->tm_mtx); \
+ mtx_unlock(&(tm)->tm_mtx); \
else if ((tm)->tm_tty != NULL) \
tty_unlock((tm)->tm_tty); \
} while (0)
#define TERMINAL_LOCK_TTY(tm) do { \
if ((tm)->tm_flags & TF_CONS) \
- mtx_lock_spin(&(tm)->tm_mtx); \
+ mtx_lock(&(tm)->tm_mtx); \
} while (0)
#define TERMINAL_UNLOCK_TTY(tm) do { \
if ((tm)->tm_flags & TF_CONS) \
- mtx_unlock_spin(&(tm)->tm_mtx); \
+ mtx_unlock(&(tm)->tm_mtx); \
} while (0)
-#define TERMINAL_LOCK_CONS(tm) mtx_lock_spin(&(tm)->tm_mtx)
-#define TERMINAL_UNLOCK_CONS(tm) mtx_unlock_spin(&(tm)->tm_mtx)
+#define TERMINAL_LOCK_CONS(tm) mtx_lock(&(tm)->tm_mtx)
+#define TERMINAL_UNLOCK_CONS(tm) mtx_unlock(&(tm)->tm_mtx)
/*
* TTY routines.
@@ -170,7 +170,7 @@
int fg, bg;
if (tm->tm_flags & TF_CONS)
- mtx_init(&tm->tm_mtx, "trmlck", NULL, MTX_SPIN);
+ mtx_init(&tm->tm_mtx, "trmlck", NULL, MTX_DEF);
teken_init(&tm->tm_emulator, &terminal_drawmethods, tm);

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 24, 9:39 PM (6 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32092910
Default Alt Text
D39323.id.diff (2 KB)

Event Timeline