Revert uio.uio_td back to uio.uio_procp, using a #define in usb_port to

do the right thing on -current.

4 files changed, 7 insertions, 5 deletions

diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index fcb8ec7..9a29509 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1259,7 +1259,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
 		uio.uio_offset = 0;
 		uio.uio_segflg = UIO_USERSPACE;
 		uio.uio_rw = UIO_READ;
-		uio.uio_td = p;
+		uio.uio_procp = p;
 		error = uiomove((void *)cdesc, len, &uio);
 		free(cdesc, M_TEMP);
 		return (error);
@@ -1305,7 +1305,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
 			uio.uio_rw =
 				ur->request.bmRequestType & UT_READ ? 
 				UIO_READ : UIO_WRITE;
-			uio.uio_td = p;
+			uio.uio_procp = p;
 			ptr = malloc(len, M_TEMP, M_WAITOK);
 			if (uio.uio_rw == UIO_WRITE) {
 				error = uiomove(ptr, len, &uio);
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index e53cd1c..dc01ef3 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -585,7 +585,7 @@ urioioctl(dev, cmd, addr, flag, p)
 		uio.uio_rw =
 			req.bmRequestType & UT_READ ? 
 			UIO_READ : UIO_WRITE;
-		uio.uio_td = p;
+		uio.uio_procp = p;
 		ptr = malloc(len, M_TEMP, M_WAITOK);
 		if (uio.uio_rw == UIO_WRITE) {
 			error = uiomove(ptr, len, &uio);
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index bbee3c8..c35d679 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -50,7 +50,6 @@
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
-#include <sys/kthread.h>
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/device.h>
 #elif defined(__FreeBSD__)
@@ -60,6 +59,7 @@
 #include <sys/filio.h>
 #include <sys/uio.h>
 #endif
+#include <sys/kthread.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/poll.h>
@@ -474,7 +474,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 			uio.uio_rw =
 				ur->request.bmRequestType & UT_READ ? 
 				UIO_READ : UIO_WRITE;
-			uio.uio_td = p;
+			uio.uio_procp = p;
 			ptr = malloc(len, M_TEMP, M_WAITOK);
 			if (uio.uio_rw == UIO_WRITE) {
 				error = uiomove(ptr, len, &uio);
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 52313a1..21cb986 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -294,6 +294,8 @@ __CONCAT(dname,_detach)(self, flags) \
 
 typedef struct thread *usb_proc_ptr;
 
+#define uio_procp uio_td
+
 /* XXX Change this when FreeBSD has memset */
 #define	memcpy(d, s, l)		bcopy((s),(d),(l))
 #define	memset(d, v, l)		bzero((d),(l))