Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/x68k/dev/event.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/x68k/dev/event.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.10
retrieving revision 1.10.8.2
diff -u -p -r1.10 -r1.10.8.2
--- src/sys/arch/x68k/dev/event.c	2005/01/18 07:12:15	1.10
+++ src/sys/arch/x68k/dev/event.c	2007/09/03 14:31:04	1.10.8.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: event.c,v 1.10 2005/01/18 07:12:15 chs Exp $ */
+/*	$NetBSD: event.c,v 1.10.8.2 2007/09/03 14:31:04 yamt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.10 2005/01/18 07:12:15 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.10.8.2 2007/09/03 14:31:04 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/fcntl.h>
@@ -69,7 +69,7 @@ ev_init(struct evvar *ev)
 	ev->ev_get = ev->ev_put = 0;
 	ev->ev_q = malloc((u_long)EV_QSIZE * sizeof(struct firm_event),
 	    M_DEVBUF, M_WAITOK);
-	memset((caddr_t)ev->ev_q, 0, EV_QSIZE * sizeof(struct firm_event));
+	memset((void *)ev->ev_q, 0, EV_QSIZE * sizeof(struct firm_event));
 }
 
 /*
@@ -103,7 +103,7 @@ ev_read(struct evvar *ev, struct uio *ui
 			return (EWOULDBLOCK);
 		}
 		ev->ev_wanted = 1;
-		error = tsleep((caddr_t)ev, PEVENT | PCATCH, "firm_event", 0);
+		error = tsleep((void *)ev, PEVENT | PCATCH, "firm_event", 0);
 		if (error) {
 			splx(s);
 			return (error);
@@ -121,7 +121,7 @@ ev_read(struct evvar *ev, struct uio *ui
 	n = howmany(uio->uio_resid, sizeof(struct firm_event));
 	if (cnt > n)
 		cnt = n;
-	error = uiomove((caddr_t)&ev->ev_q[ev->ev_get],
+	error = uiomove((void *)&ev->ev_q[ev->ev_get],
 	    cnt * sizeof(struct firm_event), uio);
 	n -= cnt;
 	/*
@@ -134,21 +134,21 @@ ev_read(struct evvar *ev, struct uio *ui
 		return (error);
 	if (cnt > n)
 		cnt = n;
-	error = uiomove((caddr_t)&ev->ev_q[0],
+	error = uiomove((void *)&ev->ev_q[0],
 	    cnt * sizeof(struct firm_event), uio);
 	ev->ev_get = cnt;
 	return (error);
 }
 
 int
-ev_poll(struct evvar *ev, int events, struct proc *p)
+ev_poll(struct evvar *ev, int events, struct lwp *l)
 {
 	int s, revents = 0;
 
 	s = splev();
 	if (events & (POLLIN | POLLRDNORM)) {
 		if (ev->ev_get == ev->ev_put)
-			selrecord(p, &ev->ev_sel);
+			selrecord(l, &ev->ev_sel);
 		else
 			revents |= events & (POLLIN | POLLRDNORM);
 	}