From: Alex Hornung <ahornung@gmail.com>
Date: Sat, 11 Sep 2010 13:21:23 +0000 (+0100)
Subject: Fix manual break to debugger
X-Git-Url: https://gitweb.dragonflybsd.org/~mneumann/dragonfly.git/commitdiff_plain/e628d79a909bc02140357dff412bbc16bea9c47e

Fix manual break to debugger

* When manually breaking to debugger, we can't hold any tokens as they
  get in the way of kbdmux' lockmgr in an interrupt context.
---

diff --git a/sys/dev/misc/syscons/syscons.c b/sys/dev/misc/syscons/syscons.c
index 7cf4abac58..f55ab78e5c 100644
--- a/sys/dev/misc/syscons/syscons.c
+++ b/sys/dev/misc/syscons/syscons.c
@@ -3457,11 +3457,13 @@ next_code:
 
 	    case DBG:
 #ifndef SC_DISABLE_DDBKEY
+		lwkt_reltoken(&tty_token);
 #ifdef DDB
 		Debugger("manual escape to debugger");
 #else
 		kprintf("No debugger in kernel\n");
 #endif
+		lwkt_gettoken(&tty_token);
 #else /* SC_DISABLE_DDBKEY */
 		/* do nothing */
 #endif /* SC_DISABLE_DDBKEY */