From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Sat, 28 Aug 2010 05:18:08 +0000 (-0700)
Subject: sio - Minor token fix for sio
X-Git-Tag: v2.9.0~384
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/52fe5e2acd3e12a809e00d83bd089fbfc2258dec

sio - Minor token fix for sio

* comwakeup() can be called from a callout and thus must acquire
  tty_token itself instead of asserting that it is already held.

Reported-by: lentferj
---

diff --git a/sys/dev/serial/sio/sio.c b/sys/dev/serial/sio/sio.c
index c296d1e56d..fd1748679c 100644
--- a/sys/dev/serial/sio/sio.c
+++ b/sys/dev/serial/sio/sio.c
@@ -2760,7 +2760,10 @@ comwakeup(void *chan)
 	struct com_s	*com;
 	int		unit;
 
-	ASSERT_LWKT_TOKEN_HELD(&tty_token);
+	/*
+	 * Can be called from a callout too so just get the token
+	 */
+	lwkt_gettoken(&tty_token);
 	callout_reset(&sio_timeout_handle, sio_timeout, comwakeup, NULL);
 
 	/*
@@ -2780,8 +2783,10 @@ comwakeup(void *chan)
 	/*
 	 * Check for and log errors, but not too often.
 	 */
-	if (--sio_timeouts_until_log > 0)
+	if (--sio_timeouts_until_log > 0) {
+		lwkt_gettoken(&tty_token);
 		return;
+	}
 	sio_timeouts_until_log = hz / sio_timeout;
 	for (unit = 0; unit < sio_numunits; ++unit) {
 		int	errnum;
@@ -2807,6 +2812,7 @@ comwakeup(void *chan)
 			    delta == 1 ? "" : "s", total);
 		}
 	}
+	lwkt_reltoken(&tty_token);
 }
 
 static void