Index: sys/arch/macppc/dev/aed.c
===================================================================
RCS file: /export/20060101/Repository/src/sys/arch/macppc/dev/aed.c,v
retrieving revision 1.2
diff -u -u -r1.2 aed.c
--- sys/arch/macppc/dev/aed.c	5 Jan 2006 02:11:32 -0000	1.2
+++ sys/arch/macppc/dev/aed.c	7 Jan 2006 14:36:30 -0000
@@ -406,7 +406,7 @@
 
 	selwakeup(&aed_sc->sc_selinfo);
 	if (aed_sc->sc_ioproc)
-		psignal(aed_sc->sc_ioproc, SIGIO);
+	  psignal((struct proc *) aed_sc->sc_ioproc, SIGIO);
 
 	splx(s);
 }
@@ -415,7 +415,7 @@
 aedopen(dev, flag, mode, p)
     dev_t dev;
     int flag, mode;
-    struct proc *p;
+    struct lwp *p;
 {
 	struct aed_softc *sc;
 	int s;
@@ -443,7 +443,7 @@
 aedclose(dev, flag, mode, p)
     dev_t dev;
     int flag, mode;
-    struct proc *p;
+    struct lwp *p;
 {
 	struct aed_softc *sc = device_lookup(&aed_cd, minor(dev));
 	int s = spladb();
@@ -513,7 +513,7 @@
     u_long cmd;
     caddr_t data;
     int flag;
-    struct proc *p;
+    struct lwp *p;
 {
 	struct aed_softc *sc = device_lookup(&aed_cd, minor(dev));
 
@@ -582,7 +582,7 @@
 aedpoll(dev, events, p)
 	dev_t dev;
 	int events;
-	struct proc *p;
+	struct lwp *p;
 {
 	struct aed_softc *sc = device_lookup(&aed_cd, minor(dev));
 	int s, revents;
Index: sys/arch/macppc/dev/aedvar.h
===================================================================
RCS file: /export/20060101/Repository/src/sys/arch/macppc/dev/aedvar.h,v
retrieving revision 1.2
diff -u -u -r1.2 aedvar.h
--- sys/arch/macppc/dev/aedvar.h	5 Jan 2006 02:11:32 -0000	1.2
+++ sys/arch/macppc/dev/aedvar.h	6 Jan 2006 07:26:01 -0000
@@ -63,7 +63,7 @@
 	int		sc_buttons;	/* mouse button state */
 
 	struct selinfo	sc_selinfo;	/* select() info */
-	struct proc *	sc_ioproc;	/* process to wakeup */
+	struct lwp *	sc_ioproc;	/* process to wakeup */
 
 	int		sc_open;	/* Are we queuing events? */
 	int		sc_options;	/* config options */
Index: sys/arch/macppc/dev/upad.c
===================================================================
RCS file: /export/20060101/Repository/src/sys/arch/macppc/dev/upad.c,v
retrieving revision 1.1
diff -u -u -r1.1 upad.c
--- sys/arch/macppc/dev/upad.c	5 Jan 2006 02:11:32 -0000	1.1
+++ sys/arch/macppc/dev/upad.c	7 Jan 2006 22:39:16 -0000
@@ -64,7 +64,7 @@
 void upad_intr(struct uhidev *, void *, u_int);
 int upad_enable(void *);
 void upad_disable(void *);
-int upad_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int upad_ioctl(void *, u_long, caddr_t, int, struct lwp *);
 
 struct cfattach upad_ca = {
 	"upad", {}, sizeof(struct upad_softc), upad_match, upad_attach
@@ -314,7 +314,7 @@
 	u_long cmd;
 	caddr_t data;
 	int flag;
-	struct proc *p;
+	struct lwp *p;
 {
 	return EPASSTHROUGH;
 }
Index: sys/miscfs/procfs/procfs_ctl.c
===================================================================
RCS file: /export/20060101/Repository/src/sys/miscfs/procfs/procfs_ctl.c,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 procfs_ctl.c
--- sys/miscfs/procfs/procfs_ctl.c	5 Jan 2006 01:39:50 -0000	1.1.1.1
+++ sys/miscfs/procfs/procfs_ctl.c	7 Jan 2006 04:59:17 -0000
@@ -305,7 +305,7 @@
 			SCHED_UNLOCK(s);
 		} else {
 			if (sig != 0)
-				psignal(p, sig);
+			  psignal(p, (unsigned int) sig);
 		}
 		return (0);
 
@@ -367,7 +367,7 @@
 				error = procfs_control(curl, l, PROCFS_CTL_RUN,
 				    nm->nm_val);
 			else {
-				psignal(p, nm->nm_val);
+			  psignal(p, (unsigned int) nm->nm_val);
 				error = 0;
 			}
 		}