Author: hselasky
Date: Mon Mar 17 06:36:54 2014
New Revision: 263260
URL: http://svnweb.freebsd.org/changeset/base/263260
Log:
MFC r262972:
Ignore USB keyboard driver calls from critical sections.
Modified:
stable/9/sys/dev/usb/input/ukbd.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/usb/input/ukbd.c
==============================================================================
--- stable/9/sys/dev/usb/input/ukbd.c Mon Mar 17 05:45:29 2014
(r263259)
+++ stable/9/sys/dev/usb/input/ukbd.c Mon Mar 17 06:36:54 2014
(r263260)
@@ -1890,6 +1890,12 @@ ukbd_ioctl(keyboard_t *kbd, u_long cmd,
int result;
/*
+ * XXX Check of someone is calling us from a critical section:
+ */
+ if (curthread->td_critnest != 0)
+ return (EDEADLK);
+
+ /*
* XXX KDGKBSTATE, KDSKBSTATE and KDSETLED can be called from any
* context where printf(9) can be called, which among other things
* includes interrupt filters and threads with any kinds of locks
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
