msleep redefined error in hselasky/usb4bsd/ svn patch against -current

[Mark Atkinson]

I get the following error when trying to compile the proposed usb4bsd stack
against current.

In file included from /usr/src/sys/dev/usb/ehci.c:67:
/usr/src/sys/dev/usb/usb_port.h:293:1: "msleep" redefined
In file included from /usr/src/sys/dev/usb/ehci.c:58:
/usr/src/sys/sys/systm.h:313:1: this is the location of the previous
definition
*** Error code 1

Sure enough, it is intentionally redefined:

sys/dev/usb/usb_port.h:290-293

/* preliminary fix for a bug in msleep on FreeBSD, 
 * which cannot sleep with Giant:
 */
#define msleep(i,m,p,w,t) msleep(i,(((m) == &Giant) ? NULL : (m)),p,w,t)


-- 
Mark Atkinson
atkin901 at yahoo.com
(!wired)?(coffee++):(wired);