Date: Thu, 29 Apr 2010 22:47:01 +0000 (UTC) From: Andrew Thompson <thompsa@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r207400 - stable/8/sys/dev/usb Message-ID: <201004292247.o3TMl1XA081726@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thompsa Date: Thu Apr 29 22:47:01 2010 New Revision: 207400 URL: http://svn.freebsd.org/changeset/base/207400 Log: MFC r207078 Use SX_DUPOK rather than making the string unique. Modified: stable/8/sys/dev/usb/usb_device.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/geom/sched/ (props changed) Modified: stable/8/sys/dev/usb/usb_device.c ============================================================================== --- stable/8/sys/dev/usb/usb_device.c Thu Apr 29 22:44:04 2010 (r207399) +++ stable/8/sys/dev/usb/usb_device.c Thu Apr 29 22:47:01 2010 (r207400) @@ -1491,10 +1491,10 @@ usb_alloc_device(device_t parent_dev, st return (NULL); } /* initialise our SX-lock */ - sx_init(udev->default_sx, "0123456789ABCDEF - USB device SX lock" + depth); + sx_init_flags(udev->default_sx, "USB device SX lock", SX_DUPOK); /* initialise our SX-lock */ - sx_init(udev->default_sx + 1, "0123456789ABCDEF - USB config SX lock" + depth); + sx_init_flags(udev->default_sx + 1, "USB config SX lock", SX_DUPOK); cv_init(udev->default_cv, "WCTRL"); cv_init(udev->default_cv + 1, "UGONE");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004292247.o3TMl1XA081726>