Module Name: src
Committed By: mrg
Date: Tue Nov 27 04:54:58 UTC 2012
Modified Files:
src/sys/dev/usb: usb.c
Log Message:
since usb task add/remove is supposed to be callable in any usb
context, make sure the lock is OK for such. ie, not a sleeping lock.
fixes PR#47244.
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/usb/usb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.135 src/sys/dev/usb/usb.c:1.136
--- src/sys/dev/usb/usb.c:1.135 Fri Jul 20 23:18:02 2012
+++ src/sys/dev/usb/usb.c Tue Nov 27 04:54:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.135 2012/07/20 23:18:02 mrg Exp $ */
+/* $NetBSD: usb.c,v 1.136 2012/11/27 04:54:58 mrg Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.135 2012/07/20 23:18:02 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.136 2012/11/27 04:54:58 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usb.h"
@@ -224,7 +224,11 @@ usb_once_init(void)
taskq = &usb_taskq[i];
TAILQ_INIT(&taskq->tasks);
- mutex_init(&taskq->lock, MUTEX_DEFAULT, IPL_NONE);
+ /*
+ * Since USB tasks are callable from any context, we have to
+ * make this lock a spinlock.
+ */
+ mutex_init(&taskq->lock, MUTEX_DEFAULT, IPL_USB);
cv_init(&taskq->cv, "usbtsk");
taskq->name = taskq_names[i];
if (kthread_create(PRI_NONE, KTHREAD_MPSAFE, NULL,
