Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/jmcneill-usbmp]: src/sys/dev/usb timeout_handle callout is MPSAFE, mark ...



details:   https://anonhg.NetBSD.org/src/rev/bbba73dcde85
branches:  jmcneill-usbmp
changeset: 771800:bbba73dcde85
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Feb 20 05:09:36 2012 +0000

description:
timeout_handle callout is MPSAFE, mark it as such.

diffstat:

 sys/dev/usb/usbdi.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 7386421ebbcb -r bbba73dcde85 sys/dev/usb/usbdi.c
--- a/sys/dev/usb/usbdi.c       Mon Feb 20 04:25:54 2012 +0000
+++ b/sys/dev/usb/usbdi.c       Mon Feb 20 05:09:36 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdi.c,v 1.134.2.7 2012/02/20 02:12:24 mrg Exp $      */
+/*     $NetBSD: usbdi.c,v 1.134.2.8 2012/02/20 05:09:36 mrg Exp $      */
 /*     $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $      */
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.134.2.7 2012/02/20 02:12:24 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.134.2.8 2012/02/20 05:09:36 mrg Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_usb.h"
@@ -387,7 +387,8 @@
        if (xfer == NULL)
                return (NULL);
        xfer->device = dev;
-       callout_init(&xfer->timeout_handle, 0);
+       callout_init(&xfer->timeout_handle,
+           dev->bus->methods->get_locks ? CALLOUT_MPSAFE : 0);
        cv_init(&xfer->cv, "usbxfer");
        cv_init(&xfer->hccv, "usbhcxfer");
        DPRINTFN(5,("usbd_alloc_xfer() = %p\n", xfer));



Home | Main Index | Thread Index | Old Index