From 573c688a6892861601397d1797b75cf321e5a3b6 Mon Sep 17 00:00:00 2001
From: dg <dg@FreeBSD.org>
Date: Sat, 9 Sep 1995 18:10:37 +0000
Subject: Fixed init functions argument type - caddr_t -> void *. Fixed a
 couple of compiler warnings.

---
 sys/amd64/amd64/autoconf.c    | 16 ++++++++------
 sys/amd64/amd64/machdep.c     |  8 +++----
 sys/amd64/amd64/mem.c         |  4 ++--
 sys/dev/speaker/spkr.c        |  4 ++--
 sys/i386/i386/autoconf.c      | 16 ++++++++------
 sys/i386/i386/conf.c          |  3 +--
 sys/i386/i386/cons.c          |  4 ++--
 sys/i386/i386/machdep.c       |  8 +++----
 sys/i386/i386/mem.c           |  4 ++--
 sys/i386/isa/spkr.c           |  4 ++--
 sys/kern/init_main.c          | 50 +++++++++++++++++++++----------------------
 sys/kern/kern_clock.c         |  8 +++----
 sys/kern/kern_malloc.c        |  8 +++----
 sys/kern/kern_synch.c         |  8 +++----
 sys/kern/kern_tc.c            |  8 +++----
 sys/kern/kern_timeout.c       |  8 +++----
 sys/kern/subr_clist.c         |  8 +++----
 sys/kern/subr_prof.c          |  6 +++---
 sys/kern/sysv_msg.c           |  6 +++---
 sys/kern/sysv_sem.c           |  6 +++---
 sys/kern/sysv_shm.c           |  6 +++---
 sys/kern/tty_cons.c           |  4 ++--
 sys/kern/tty_subr.c           |  8 +++----
 sys/kern/uipc_domain.c        | 26 +++++++++++-----------
 sys/kern/uipc_mbuf.c          |  8 +++----
 sys/kern/vfs_bio.c            |  4 ++--
 sys/kern/vfs_conf.c           |  8 +++----
 sys/kern/vfs_init.c           |  8 +++----
 sys/kern/vfs_mount.c          |  8 +++----
 sys/miscfs/devfs/devfs_tree.c |  4 ++--
 sys/net/if.c                  |  8 +++----
 sys/net/if_disc.c             |  6 +++---
 sys/net/if_loop.c             |  6 +++---
 sys/net/if_ppp.c              |  6 +++---
 sys/net/if_sl.c               |  6 +++---
 sys/net/if_tun.c              |  4 ++--
 sys/sys/kernel.h              |  8 +++----
 sys/sys/mount.h               |  6 +++---
 sys/vm/vm_glue.c              | 16 +++++++-------
 sys/vm/vm_init.c              |  8 +++----
 sys/vm/vm_pageout.c           |  6 +++---
 41 files changed, 177 insertions(+), 174 deletions(-)

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 4eb5684..ecf5def 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.36 1995/08/30 01:34:20 bde Exp $
+ *	$Id: autoconf.c,v 1.37 1995/09/03 05:43:00 julian Exp $
  */
 
 /*
@@ -74,13 +74,13 @@ extern struct vfsops	ufs_vfsops;
 extern struct vfsops	lfs_vfsops;
 #endif
 #ifdef NFS
-int nfs_mountroot __P((void));
+int nfs_mountroot __P((void *));
 #endif
 #ifdef CD9660
-int cd9660_mountroot __P((void));
+int cd9660_mountroot __P((void *));
 #endif
 #ifdef MSDOSFS
-int msdosfs_mountroot __P((void));
+int msdosfs_mountroot __P((void *));
 #endif
 #ifdef MFS_ROOT
 int mfs_initminiroot __P((u_char *));
@@ -118,7 +118,8 @@ static struct {
 };
 
 int
-find_cdrom_root()
+find_cdrom_root(dummy)
+	void *dummy;
 {
 	int i,j,k;
 
@@ -127,7 +128,7 @@ find_cdrom_root()
 			rootdev = makedev(try_cdrom[k].major,j*8);
 			printf("trying rootdev=0x%lx (%s%d)\n",
 				rootdev, try_cdrom[k].name,j);
-			i = (*cd9660_mountroot)();
+			i = (*cd9660_mountroot)(NULL);
 			if (!i) return i;
 		}
 	return EINVAL;
@@ -159,7 +160,8 @@ configure_finish()
  * Determine i/o configuration for a machine.
  */
 void
-configure( caddr_t dummy ) /* arg not used */
+configure(dummy) /* arg not used */
+	void *dummy;
 {
 
 	configure_start();
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index f0f5724..df465fa 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.139 1995/09/06 16:13:31 wpaul Exp $
+ *	$Id: machdep.c,v 1.140 1995/09/08 03:19:47 davidg Exp $
  */
 
 #include "npx.h"
@@ -130,7 +130,7 @@
  * System initialization
  */
 
-static void cpu_startup __P(( caddr_t));
+static void cpu_startup __P((void *));
 
 SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
 
@@ -197,8 +197,8 @@ extern struct linker_set netisr_set;
 
 /* ARGSUSED*/
 static void
-cpu_startup( udata)
-caddr_t		udata;	/* not used*/
+cpu_startup(udata)
+	void *udata;	/* not used*/
 {
 	register unsigned i;
 	register caddr_t v;
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index aac5aa7..a8c1548 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.10 1995/09/03 05:43:04 julian Exp $
+ *	$Id: mem.c,v 1.11 1995/09/08 11:07:08 bde Exp $
  */
 
 /*
@@ -67,7 +67,7 @@
 #include "sys/kernel.h"
 int mmopen();
 
-void memdev_init(caddr_t data) /* data not used */
+void memdev_init(void *data) /* data not used */
 {
   void * x;
 /*            path	name	devsw   minor	type   uid gid perm*/
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 764d552..82a7021 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.15 1995/09/03 05:43:31 julian Exp $
+ *    $Id: spkr.c,v 1.16 1995/09/08 11:07:59 bde Exp $
  */
 
 #include "speaker.h"
@@ -28,7 +28,7 @@
 #include "sys/kernel.h"
 int spkropen();
 
-void spkrdev_init(caddr_t data) /* data not used */
+void spkrdev_init(void *data) /* data not used */
 {
   void * x;
 /*            path	name		devsw   minor	type   uid gid perm*/
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 4eb5684..ecf5def 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.36 1995/08/30 01:34:20 bde Exp $
+ *	$Id: autoconf.c,v 1.37 1995/09/03 05:43:00 julian Exp $
  */
 
 /*
@@ -74,13 +74,13 @@ extern struct vfsops	ufs_vfsops;
 extern struct vfsops	lfs_vfsops;
 #endif
 #ifdef NFS
-int nfs_mountroot __P((void));
+int nfs_mountroot __P((void *));
 #endif
 #ifdef CD9660
-int cd9660_mountroot __P((void));
+int cd9660_mountroot __P((void *));
 #endif
 #ifdef MSDOSFS
-int msdosfs_mountroot __P((void));
+int msdosfs_mountroot __P((void *));
 #endif
 #ifdef MFS_ROOT
 int mfs_initminiroot __P((u_char *));
@@ -118,7 +118,8 @@ static struct {
 };
 
 int
-find_cdrom_root()
+find_cdrom_root(dummy)
+	void *dummy;
 {
 	int i,j,k;
 
@@ -127,7 +128,7 @@ find_cdrom_root()
 			rootdev = makedev(try_cdrom[k].major,j*8);
 			printf("trying rootdev=0x%lx (%s%d)\n",
 				rootdev, try_cdrom[k].name,j);
-			i = (*cd9660_mountroot)();
+			i = (*cd9660_mountroot)(NULL);
 			if (!i) return i;
 		}
 	return EINVAL;
@@ -159,7 +160,8 @@ configure_finish()
  * Determine i/o configuration for a machine.
  */
 void
-configure( caddr_t dummy ) /* arg not used */
+configure(dummy) /* arg not used */
+	void *dummy;
 {
 
 	configure_start();
diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c
index 94d03eb..4fc699a 100644
--- a/sys/i386/i386/conf.c
+++ b/sys/i386/i386/conf.c
@@ -42,7 +42,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)conf.c	5.8 (Berkeley) 5/12/91
- *	$Id: conf.c,v 1.95 1995/09/03 23:55:53 jkh Exp $
+ *	$Id: conf.c,v 1.96 1995/09/08 03:37:51 julian Exp $
  */
 
 #include <sys/param.h>
@@ -55,7 +55,6 @@
 #include <sys/conf.h>
 
 d_rdwr_t rawread, rawwrite;
-d_strategy_t swstrategy;
 
 /* Lots of bogus defines for shorthand purposes */
 #define noopen		(d_open_t *)enodev
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index af17d13..a47b6ce 100644
--- a/sys/i386/i386/cons.c
+++ b/sys/i386/i386/cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.30 1995/06/26 07:39:49 bde Exp $
+ *	$Id: cons.c,v 1.31 1995/09/03 05:43:01 julian Exp $
  */
 
 #include <sys/param.h>
@@ -80,7 +80,7 @@ static struct tty *cn_tp;	/* physical console tty struct */
 #include <sys/devfsext.h>
 #include "sys/kernel.h"
 
-void cndev_init(caddr_t data) /* data not used */
+void cndev_init(void *data) /* data not used */
 {
   void * x;
 /*            path	name		devsw   minor	type   uid gid perm*/
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index f0f5724..df465fa 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.139 1995/09/06 16:13:31 wpaul Exp $
+ *	$Id: machdep.c,v 1.140 1995/09/08 03:19:47 davidg Exp $
  */
 
 #include "npx.h"
@@ -130,7 +130,7 @@
  * System initialization
  */
 
-static void cpu_startup __P(( caddr_t));
+static void cpu_startup __P((void *));
 
 SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
 
@@ -197,8 +197,8 @@ extern struct linker_set netisr_set;
 
 /* ARGSUSED*/
 static void
-cpu_startup( udata)
-caddr_t		udata;	/* not used*/
+cpu_startup(udata)
+	void *udata;	/* not used*/
 {
 	register unsigned i;
 	register caddr_t v;
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index aac5aa7..a8c1548 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.10 1995/09/03 05:43:04 julian Exp $
+ *	$Id: mem.c,v 1.11 1995/09/08 11:07:08 bde Exp $
  */
 
 /*
@@ -67,7 +67,7 @@
 #include "sys/kernel.h"
 int mmopen();
 
-void memdev_init(caddr_t data) /* data not used */
+void memdev_init(void *data) /* data not used */
 {
   void * x;
 /*            path	name	devsw   minor	type   uid gid perm*/
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 764d552..82a7021 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.15 1995/09/03 05:43:31 julian Exp $
+ *    $Id: spkr.c,v 1.16 1995/09/08 11:07:59 bde Exp $
  */
 
 #include "speaker.h"
@@ -28,7 +28,7 @@
 #include "sys/kernel.h"
 int spkropen();
 
-void spkrdev_init(caddr_t data) /* data not used */
+void spkrdev_init(void *data) /* data not used */
 {
   void * x;
 /*            path	name		devsw   minor	type   uid gid perm*/
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 447483d..9de00a8 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.28 1995/08/29 23:59:22 bde Exp $
+ * $Id: init_main.c,v 1.29 1995/09/03 05:43:35 julian Exp $
  */
 
 #include <sys/param.h>
@@ -222,8 +222,8 @@ main(framep)
  */
 /* ARGSUSED*/
 void
-kproc_start( udata)
-caddr_t		udata;	/* pointer to a 'kproc_desc' ? */
+kproc_start(udata)
+	void *udata;	/* pointer to a 'kproc_desc' ? */
 {
 	struct kproc_desc	*kp = (struct kproc_desc *)udata;
 	struct proc		*p = curproc;
@@ -272,15 +272,15 @@ char	copyright[] =
 char	copyright[] =
 "Copyright (c) 1982, 1986, 1989, 1991, 1993\n\tThe Regents of the University of California.  All rights reserved.\n\n";
 #endif
-static void print_caddr_t __P((caddr_t data));
+static void print_caddr_t __P((void *data));
 static void
 print_caddr_t(data)
-	caddr_t data;
+	void *data;
 {
 	printf("%s", (char *)data);
 }
 SYSINIT(announce, SI_SUB_COPYRIGHT, SI_ORDER_FIRST, print_caddr_t,
-	(caddr_t)copyright)
+	copyright)
 
 
 /*
@@ -297,10 +297,10 @@ SYSINIT(announce, SI_SUB_COPYRIGHT, SI_ORDER_FIRST, print_caddr_t,
  ***************************************************************************
  */
 /* ARGSUSED*/
-void proc0_init __P((caddr_t udata));
+void proc0_init __P((void *udata));
 void
-proc0_init( udata)
-caddr_t		udata;		/* not used*/
+proc0_init(udata)
+	void *udata;		/* not used*/
 {
 	register struct proc		*p;
 	register struct filedesc0	*fdp;
@@ -400,10 +400,10 @@ caddr_t		udata;		/* not used*/
 SYSINIT(p0init, SI_SUB_INTRINSIC, SI_ORDER_FIRST, proc0_init, NULL)
 
 /* ARGSUSED*/
-void proc0_post __P((caddr_t udata));
+void proc0_post __P((void *udata));
 void
-proc0_post( udata)
-caddr_t		udata;		/* not used*/
+proc0_post(udata)
+	void *udata;		/* not used*/
 {
 	/*
 	 * Now can look at time, having had a chance to verify the time
@@ -430,10 +430,10 @@ SYSINIT(p0post, SI_SUB_INTRINSIC_POST, SI_ORDER_FIRST, proc0_post, NULL)
  ***************************************************************************
  */
 /* ARGSUSED*/
-void sched_setup __P((caddr_t udata));
+void sched_setup __P((void *udata));
 void
-sched_setup( udata)
-caddr_t		udata;		/* not used*/
+sched_setup(udata)
+	void *udata;		/* not used*/
 {
 	/* Kick off timeout driven events by calling first time. */
 	roundrobin(NULL);
@@ -442,22 +442,22 @@ caddr_t		udata;		/* not used*/
 SYSINIT(sched_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, sched_setup, NULL)
 
 /* ARGSUSED*/
-void xxx_vfs_mountroot __P((caddr_t udata));
+void xxx_vfs_mountroot __P((void *udata));
 void
-xxx_vfs_mountroot( udata)
-caddr_t		udata;		/* not used*/
+xxx_vfs_mountroot(udata)
+	void *udata;		/* not used*/
 {
 	/* Mount the root file system. */
-	if ((*mountroot)( (caddr_t)mountrootvfsops))
+	if ((*mountroot)(mountrootvfsops))
 		panic("cannot mount root");
 }
 SYSINIT(mountroot, SI_SUB_ROOT, SI_ORDER_FIRST, xxx_vfs_mountroot, NULL)
 
 /* ARGSUSED*/
-void xxx_vfs_root_fdtab __P((caddr_t udata));
+void xxx_vfs_root_fdtab __P((void *udata));
 void
-xxx_vfs_root_fdtab( udata)
-caddr_t		udata;		/* not used*/
+xxx_vfs_root_fdtab(udata)
+	void *udata;		/* not used*/
 {
 	register struct filedesc0	*fdp = &filedesc0;
 
@@ -485,7 +485,7 @@ SYSINIT(retrofit, SI_SUB_ROOT_FDTAB, SI_ORDER_FIRST, xxx_vfs_root_fdtab, NULL)
  ***************************************************************************
  */
 
-static void kthread_init __P(( caddr_t udata));
+static void kthread_init __P((void *udata));
 SYSINIT_KT(init,SI_SUB_KTHREAD_INIT, SI_ORDER_FIRST, kthread_init, NULL)
 
 
@@ -493,8 +493,8 @@ static void start_init __P((struct proc *p, void *framep));
 
 /* ARGSUSED*/
 static void
-kthread_init( udata)
-caddr_t		udata;		/* not used*/
+kthread_init(udata)
+	void *udata;		/* not used*/
 {
 
 	/* Create process 1 (init(8)). */
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 04af42b..ede7b6d 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.14 1995/07/29 11:40:12 bde Exp $
+ * $Id: kern_clock.c,v 1.15 1995/08/28 09:18:43 julian Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -79,7 +79,7 @@
  * System initialization
  */
 
-static void initclocks __P(( caddr_t udata));
+static void initclocks __P((void *udata));
 SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL)
 
 
@@ -393,8 +393,8 @@ hardupdate(offset)
  */
 /* ARGSUSED*/
 static void
-initclocks( udata)
-caddr_t		udata;		/* not used*/
+initclocks(udata)
+	void *udata;		/* not used*/
 {
 	register int i;
 
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 52c95c5..dba7930 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_malloc.c	8.3 (Berkeley) 1/4/94
- * $Id: kern_malloc.c,v 1.12 1995/05/30 08:05:33 rgrimes Exp $
+ * $Id: kern_malloc.c,v 1.13 1995/08/28 09:18:44 julian Exp $
  */
 
 #include <sys/param.h>
@@ -47,7 +47,7 @@
  * System initialization
  */
 
-static void kmeminit __P((caddr_t));
+static void kmeminit __P((void *));
 SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_FIRST, kmeminit, NULL)
 
 
@@ -366,8 +366,8 @@ free(addr, type)
  */
 /* ARGSUSED*/
 static void
-kmeminit( udata)
-caddr_t		udata;		/* not used*/
+kmeminit(udata)
+	void *udata;		/* not used*/
 {
 	register long indx;
 	int npg;
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 6f97a63..1d0603e 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_synch.c	8.6 (Berkeley) 1/21/94
- * $Id: kern_synch.c,v 1.11 1995/05/30 08:05:44 rgrimes Exp $
+ * $Id: kern_synch.c,v 1.12 1995/08/28 09:18:45 julian Exp $
  */
 
 #include <sys/param.h>
@@ -59,7 +59,7 @@
  * System initialization
  */
 
-static void rqinit __P((caddr_t));
+static void rqinit __P((void *));
 SYSINIT(runqueue, SI_SUB_RUN_QUEUE, SI_ORDER_FIRST, rqinit, NULL)
 
 
@@ -614,8 +614,8 @@ mi_switch()
  */
 /* ARGSUSED*/
 static void
-rqinit( udata)
-caddr_t		udata;		/* not used*/
+rqinit(udata)
+	void *udata;		/* not used*/
 {
 	register int i;
 
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 04af42b..ede7b6d 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.14 1995/07/29 11:40:12 bde Exp $
+ * $Id: kern_clock.c,v 1.15 1995/08/28 09:18:43 julian Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -79,7 +79,7 @@
  * System initialization
  */
 
-static void initclocks __P(( caddr_t udata));
+static void initclocks __P((void *udata));
 SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL)
 
 
@@ -393,8 +393,8 @@ hardupdate(offset)
  */
 /* ARGSUSED*/
 static void
-initclocks( udata)
-caddr_t		udata;		/* not used*/
+initclocks(udata)
+	void *udata;		/* not used*/
 {
 	register int i;
 
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 04af42b..ede7b6d 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.14 1995/07/29 11:40:12 bde Exp $
+ * $Id: kern_clock.c,v 1.15 1995/08/28 09:18:43 julian Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -79,7 +79,7 @@
  * System initialization
  */
 
-static void initclocks __P(( caddr_t udata));
+static void initclocks __P((void *udata));
 SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL)
 
 
@@ -393,8 +393,8 @@ hardupdate(offset)
  */
 /* ARGSUSED*/
 static void
-initclocks( udata)
-caddr_t		udata;		/* not used*/
+initclocks(udata)
+	void *udata;		/* not used*/
 {
 	register int i;
 
diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c
index 9694bcb..ec88067 100644
--- a/sys/kern/subr_clist.c
+++ b/sys/kern/subr_clist.c
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $Id: tty_subr.c,v 1.11 1995/07/11 19:39:54 bde Exp $
+ * $Id: tty_subr.c,v 1.12 1995/08/28 09:18:50 julian Exp $
  */
 
 /*
@@ -25,7 +25,7 @@
  * System initialization
  */
 
-static void clist_init __P((caddr_t));
+static void clist_init __P((void *));
 SYSINIT(clist, SI_SUB_CLIST, SI_ORDER_FIRST, clist_init, NULL)
 
 struct cblock *cfreelist = 0;
@@ -57,8 +57,8 @@ cbstat()
  */
 /* ARGSUSED*/
 static void
-clist_init( udata)
-caddr_t		udata;		/* not used*/
+clist_init(udata)
+	void *udata;		/* not used*/
 {
 	/*
 	 * Allocate an initial base set of cblocks as a 'slush'.
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index 22406c5..f044c28 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prof.c	8.3 (Berkeley) 9/23/93
- * $Id: subr_prof.c,v 1.7 1995/08/28 09:18:46 julian Exp $
+ * $Id: subr_prof.c,v 1.8 1995/08/29 03:09:05 bde Exp $
  */
 
 #include <sys/param.h>
@@ -48,7 +48,7 @@
 #include <sys/malloc.h>
 #include <sys/gmon.h>
 
-static void kmstartup __P((caddr_t));
+static void kmstartup __P((void *));
 SYSINIT(kmem, SI_SUB_KPROF, SI_ORDER_FIRST, kmstartup, NULL)
 
 struct gmonparam _gmonparam = { GMON_PROF_OFF };
@@ -58,7 +58,7 @@ extern char etext[];
 
 static void
 kmstartup(udata)
-	caddr_t udata;
+	void *udata;
 {
 	char *cp;
 	struct gmonparam *p = &_gmonparam;
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 8f66ebe..533cf75 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_msg.c,v 1.6 1995/08/28 09:18:46 julian Exp $ */
+/*	$Id: sysv_msg.c,v 1.7 1995/08/30 00:33:00 bde Exp $ */
 
 /*
  * Implementation of SVID messages
@@ -26,7 +26,7 @@
 #include <sys/msg.h>
 #include <sys/malloc.h>
 
-static void msginit __P((caddr_t));
+static void msginit __P((void *));
 SYSINIT(sysv_msg, SI_SUB_SYSV_MSG, SI_ORDER_FIRST, msginit, NULL)
 
 #define MSG_DEBUG
@@ -46,7 +46,7 @@ struct msqid_ds *msqids;	/* MSGMNI msqid_ds struct's */
 
 void
 msginit(udata)
-	caddr_t udata;
+	void *udata;
 {
 	register int i;
 
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index d688251..afcbc6d 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_sem.c,v 1.7 1995/08/28 09:18:47 julian Exp $ */
+/*	$Id: sysv_sem.c,v 1.8 1995/08/30 00:33:01 bde Exp $ */
 
 /*
  * Implementation of SVID semaphores
@@ -15,7 +15,7 @@
 #include <sys/sem.h>
 #include <sys/malloc.h>
 
-static void seminit __P((caddr_t));
+static void seminit __P((void *));
 SYSINIT(sysv_sem, SI_SUB_SYSV_SEM, SI_ORDER_FIRST, seminit, NULL)
 
 static int	semctl(), semget(), semop(), semconfig();
@@ -31,7 +31,7 @@ static struct proc *semlock_holder = NULL;
 
 void
 seminit(udata)
-	caddr_t udata;
+	void *udata;
 {
 	register int i;
 
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index a80d781..ffbad31 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_shm.c,v 1.7 1995/08/28 09:18:48 julian Exp $ */
+/*	$Id: sysv_shm.c,v 1.8 1995/08/30 00:33:02 bde Exp $ */
 /*	$NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $	*/
 
 /*
@@ -48,7 +48,7 @@
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 
-static void shminit __P((caddr_t));
+static void shminit __P((void *));
 SYSINIT(sysv_shm, SI_SUB_SYSV_SHM, SI_ORDER_FIRST, shminit, NULL)
 
 int	oshmctl();
@@ -557,7 +557,7 @@ shmexit(p)
 
 void
 shminit(udata)
-	caddr_t udata;
+	void *udata;
 {
 	int i;
 	vm_offset_t garbage1, garbage2;
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index af17d13..a47b6ce 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.30 1995/06/26 07:39:49 bde Exp $
+ *	$Id: cons.c,v 1.31 1995/09/03 05:43:01 julian Exp $
  */
 
 #include <sys/param.h>
@@ -80,7 +80,7 @@ static struct tty *cn_tp;	/* physical console tty struct */
 #include <sys/devfsext.h>
 #include "sys/kernel.h"
 
-void cndev_init(caddr_t data) /* data not used */
+void cndev_init(void *data) /* data not used */
 {
   void * x;
 /*            path	name		devsw   minor	type   uid gid perm*/
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index 9694bcb..ec88067 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $Id: tty_subr.c,v 1.11 1995/07/11 19:39:54 bde Exp $
+ * $Id: tty_subr.c,v 1.12 1995/08/28 09:18:50 julian Exp $
  */
 
 /*
@@ -25,7 +25,7 @@
  * System initialization
  */
 
-static void clist_init __P((caddr_t));
+static void clist_init __P((void *));
 SYSINIT(clist, SI_SUB_CLIST, SI_ORDER_FIRST, clist_init, NULL)
 
 struct cblock *cfreelist = 0;
@@ -57,8 +57,8 @@ cbstat()
  */
 /* ARGSUSED*/
 static void
-clist_init( udata)
-caddr_t		udata;		/* not used*/
+clist_init(udata)
+	void *udata;		/* not used*/
 {
 	/*
 	 * Allocate an initial base set of cblocks as a 'slush'.
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index 7eea042..b715dee 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_domain.c	8.2 (Berkeley) 10/18/93
- * $Id: uipc_domain.c,v 1.7 1995/08/16 16:13:21 bde Exp $
+ * $Id: uipc_domain.c,v 1.8 1995/08/28 09:18:51 julian Exp $
  */
 
 #include <sys/param.h>
@@ -54,19 +54,19 @@
  * want to call a registration function rather than being handled here
  * in domaininit().  Probably this will look like:
  *
- * SYSINIT(unique, SI_SUB_PROTO_DOMAI, SI_ORDER_ANY, domain_add, (caddr_t)xxx)
+ * SYSINIT(unique, SI_SUB_PROTO_DOMAI, SI_ORDER_ANY, domain_add, xxx)
  *
  * Where 'xxx' is replaced by the address of a parameter struct to be
  * passed to the doamin_add() function.
  */
 
 static int	x_save_spl;			/* used by kludge*/
-static void kludge_splimp __P((caddr_t));
-static void kludge_splx __P((caddr_t));
-static void domaininit __P((caddr_t));
-SYSINIT(splimp, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST, kludge_splimp, (caddr_t)&x_save_spl)
+static void kludge_splimp __P((void *));
+static void kludge_splx __P((void *));
+static void domaininit __P((void *));
+SYSINIT(splimp, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST, kludge_splimp, &x_save_spl)
 SYSINIT(domain, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, domaininit, NULL)
-SYSINIT(splx, SI_SUB_PROTO_END, SI_ORDER_FIRST, kludge_splx,  (caddr_t)&x_save_spl)
+SYSINIT(splx, SI_SUB_PROTO_END, SI_ORDER_FIRST, kludge_splx, &x_save_spl)
 
 
 void	pffasttimo __P((void *));
@@ -83,8 +83,8 @@ extern struct linker_set domain_set;
 
 /* ARGSUSED*/
 static void
-domaininit( udata)
-caddr_t		udata;		/* not used*/
+domaininit(udata)
+	void *udata;		/* not used*/
 {
 	register struct domain *dp, **dpp;
 	register struct protosw *pr;
@@ -131,8 +131,8 @@ caddr_t		udata;		/* not used*/
  * to this does not also take place at splimp by default.
  */
 static void
-kludge_splimp( udata)
-caddr_t		udata;
+kludge_splimp(udata)
+	void *udata;
 {
 	int	*savesplp = (int *)udata;
 
@@ -140,8 +140,8 @@ caddr_t		udata;
 }
 
 static void
-kludge_splx( udata)
-caddr_t		udata;
+kludge_splx(udata)
+	void *udata;
 {
 	int	*savesplp = (int *)udata;
 
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 77a0af1..a0ed0ed 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- * $Id: uipc_mbuf.c,v 1.10 1995/07/29 11:40:16 bde Exp $
+ * $Id: uipc_mbuf.c,v 1.11 1995/08/28 09:18:52 julian Exp $
  */
 
 #include <sys/param.h>
@@ -52,7 +52,7 @@
  * System initialization
  */
 
-static void mbinit __P((caddr_t));
+static void mbinit __P((void *));
 SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbinit, NULL)
 
 
@@ -67,8 +67,8 @@ int	max_datalen;
 
 /* ARGSUSED*/
 static void
-mbinit( udata)
-caddr_t		udata;		/* not used*/
+mbinit(udata)
+	void *udata;		/* not used*/
 {
 	int s;
 
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 0ffe00c..c4f0cea 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: vfs_bio.c,v 1.61 1995/09/03 19:56:14 dyson Exp $
+ * $Id: vfs_bio.c,v 1.62 1995/09/04 00:20:13 dyson Exp $
  */
 
 /*
@@ -63,7 +63,7 @@ static struct kproc_desc up_kp = {
 	vfs_update,
 	&updateproc
 };
-SYSINIT_KT(update, SI_SUB_KTHREAD_UPDATE, SI_ORDER_FIRST, kproc_start, (caddr_t)&up_kp)
+SYSINIT_KT(update, SI_SUB_KTHREAD_UPDATE, SI_ORDER_FIRST, kproc_start, &up_kp)
 
 
 struct buf *buf;		/* buffer header pool */
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index 6a7bb20..b5718f6 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.7 1995/08/28 09:18:54 julian Exp $
+ * $Id: vfs_conf.c,v 1.8 1995/08/30 00:17:18 bde Exp $
  */
 
 /*
@@ -61,7 +61,7 @@
 /*
  * GLOBALS
  */
-int (*mountroot) __P((caddr_t));
+int (*mountroot) __P((void *));
 struct vnode *rootvnode;
 struct vfsops	*mountrootvfsops;
 
@@ -97,8 +97,8 @@ struct vfsops	*mountrootvfsops;
  *		fixing the other file systems, not this code!
  */
 int
-vfs_mountroot( data)
-caddr_t		data;	/* file system function table*/
+vfs_mountroot(data)
+	void *data;	/* file system function table*/
 {
 	struct mount		*mp;
 	u_int			size;
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index d772c8d..4cecaf1 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_init.c	8.3 (Berkeley) 1/4/94
- * $Id: vfs_init.c,v 1.10 1995/05/30 08:06:32 rgrimes Exp $
+ * $Id: vfs_init.c,v 1.11 1995/08/28 09:18:55 julian Exp $
  */
 
 
@@ -60,7 +60,7 @@
  * System initialization
  */
 
-static void vfsinit __P((caddr_t));
+static void vfsinit __P((void *));
 SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, vfsinit, NULL)
 
 /*
@@ -239,8 +239,8 @@ struct vattr va_null;
  */
 /* ARGSUSED*/
 static void
-vfsinit( udata)
-caddr_t		udata;		/* not used*/
+vfsinit(udata)
+	void *udata;		/* not used*/
 {
 	struct vfsops **vfsp;
 	struct vfsconf **vfc;
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index 6a7bb20..b5718f6 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.7 1995/08/28 09:18:54 julian Exp $
+ * $Id: vfs_conf.c,v 1.8 1995/08/30 00:17:18 bde Exp $
  */
 
 /*
@@ -61,7 +61,7 @@
 /*
  * GLOBALS
  */
-int (*mountroot) __P((caddr_t));
+int (*mountroot) __P((void *));
 struct vnode *rootvnode;
 struct vfsops	*mountrootvfsops;
 
@@ -97,8 +97,8 @@ struct vfsops	*mountrootvfsops;
  *		fixing the other file systems, not this code!
  */
 int
-vfs_mountroot( data)
-caddr_t		data;	/* file system function table*/
+vfs_mountroot(data)
+	void *data;	/* file system function table*/
 {
 	struct mount		*mp;
 	u_int			size;
diff --git a/sys/miscfs/devfs/devfs_tree.c b/sys/miscfs/devfs/devfs_tree.c
index ae6b2d0..3605479 100644
--- a/sys/miscfs/devfs/devfs_tree.c
+++ b/sys/miscfs/devfs/devfs_tree.c
@@ -2,7 +2,7 @@
 /*
  *  Written by Julian Elischer (julian@DIALix.oz.au)
  *
- *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_tree.c,v 1.5 1995/09/08 04:46:14 julian Exp $
+ *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_tree.c,v 1.6 1995/09/09 12:51:55 julian Exp $
  */
 
 #include "param.h"
@@ -32,7 +32,7 @@ int devfs_up_and_going;
  * Notice that the ops are by indirection.. as they haven't
  * been set up yet!
  */
-void  devfs_sinit(caddr_t junk) /*proto*/
+void  devfs_sinit(void *junk) /*proto*/
 {
 	int retval; /* we will discard this */
 	devnm_p new;
diff --git a/sys/net/if.c b/sys/net/if.c
index fc4f15d..b060181 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.3 (Berkeley) 1/4/94
- * $Id: if.c,v 1.17 1995/06/28 05:31:03 davidg Exp $
+ * $Id: if.c,v 1.18 1995/08/28 09:19:00 julian Exp $
  */
 
 #include <sys/param.h>
@@ -55,7 +55,7 @@
  * System initialization
  */
 
-static void ifinit __P((caddr_t));
+static void ifinit __P((void *));
 SYSINIT(interfaces, SI_SUB_PROTO_IF, SI_ORDER_FIRST, ifinit, NULL)
 
 
@@ -72,8 +72,8 @@ struct	ifnet *ifnet;
  */
 /* ARGSUSED*/
 void
-ifinit( udata)
-caddr_t		udata;		/* not used*/
+ifinit(udata)
+	void *udata;		/* not used*/
 {
 	register struct ifnet *ifp;
 
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index 8b4ed6e..9344d65 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if_loop.c	8.1 (Berkeley) 6/10/93
- *	$Id: if_disc.c,v 1.4 1995/05/30 08:08:01 rgrimes Exp $
+ *	$Id: if_disc.c,v 1.5 1995/08/30 00:33:17 bde Exp $
  */
 
 /*
@@ -80,7 +80,7 @@
 #define DSMTU	65532
 #endif
 
-static void discattach __P((caddr_t udata));
+static void discattach __P((void *udata));
 PSEUDO_SET(discattach, if_disc);
 
 static struct	ifnet dsif;
@@ -91,7 +91,7 @@ static int dsioctl(struct ifnet *, int, caddr_t);
 /* ARGSUSED */
 static void
 discattach(udata)
-	caddr_t udata;
+	void *udata;
 {
 	register struct ifnet *ifp = &dsif;
 
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index f548661..460ad2f 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $Id: if_loop.c,v 1.10 1995/05/30 08:08:06 rgrimes Exp $
+ * $Id: if_loop.c,v 1.11 1995/08/30 00:33:18 bde Exp $
  */
 
 /*
@@ -75,7 +75,7 @@
 
 #include "bpfilter.h"
 
-static void loopattach __P((caddr_t));
+static void loopattach __P((void *));
 PSEUDO_SET(loopattach, if_loop);
 
 #ifdef TINY_LOMTU
@@ -89,7 +89,7 @@ struct	ifnet loif[NLOOP];
 /* ARGSUSED */
 static void
 loopattach(udata)
-	caddr_t udata;
+	void *udata;
 {
 	register struct ifnet *ifp;
 	register int i = 0;
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 8b9171f..acd2cf4 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -69,7 +69,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: if_ppp.c,v 1.19 1995/07/31 21:54:46 bde Exp $ */
+/* $Id: if_ppp.c,v 1.20 1995/08/30 00:33:19 bde Exp $ */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 
 #include "ppp.h"
@@ -123,7 +123,7 @@
 #include <net/if_ppp.h>
 #include <machine/cpu.h>
 
-static void pppattach __P((caddr_t));
+static void pppattach __P((void *));
 PSEUDO_SET(pppattach, if_ppp);
 
 /* This is a FreeBSD-2.x kernel. */
@@ -192,7 +192,7 @@ static u_short interactive_ports[8] = {
  */
 static void
 pppattach(udata)
-    caddr_t udata;
+    void *udata;
 {
     register struct ppp_softc *sc;
     register int i = 0;
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 28e8305..d91cd2f 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_sl.c	8.6 (Berkeley) 2/1/94
- * $Id: if_sl.c,v 1.28 1995/07/31 21:01:36 bde Exp $
+ * $Id: if_sl.c,v 1.29 1995/08/30 00:33:20 bde Exp $
  */
 
 /*
@@ -110,7 +110,7 @@ Huh? Slip without inet?
 #include <net/bpf.h>
 #endif
 
-static void slattach __P((caddr_t));
+static void slattach __P((void *));
 PSEUDO_SET(slattach, if_sl);
 
 /*
@@ -200,7 +200,7 @@ static struct linesw slipdisc =
  */
 static void
 slattach(udata)
-	caddr_t udata;
+	void *udata;
 {
 	register struct sl_softc *sc;
 	register int i = 0;
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 82a3e15..787d5bb 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -63,7 +63,7 @@
 #include <net/if_tun.h>
 
 #ifdef __FreeBSD__
-static void tunattach __P((caddr_t));
+static void tunattach __P((void *));
 PSEUDO_SET(tunattach, if_tun);
 #endif
 
@@ -92,7 +92,7 @@ static int tuninit __P((int));
 
 static void
 tunattach(udata)
-	caddr_t udata;
+	void *udata;
 {
 	register int i;
 	struct ifnet *ifp;
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index e766410..4a8bd8e 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $Id: kernel.h,v 1.11 1995/08/31 06:28:29 bde Exp $
+ * $Id: kernel.h,v 1.12 1995/09/03 05:43:50 julian Exp $
  */
 
 #ifndef _SYS_KERNEL_H_
@@ -179,8 +179,8 @@ typedef enum sysinit_elem_type {
 struct sysinit {
 	unsigned int	subsystem;		/* subsystem identifier*/
 	unsigned int	order;			/* init order within subsystem*/
-	void		(*func) __P((caddr_t));	/* init function*/
-	caddr_t		udata;			/* multiplexer/argument*/
+	void		(*func) __P((void *));	/* init function*/
+	void 		*udata;			/* multiplexer/argument*/
 	si_elem_t	type;			/* sysinit_elem_type*/
 };
 
@@ -225,7 +225,7 @@ struct kproc_desc {
 };
 
 /* init_proc.c*/
-extern void kproc_start __P(( caddr_t udata));
+extern void kproc_start __P((void *udata));
 
 
 #ifdef PSEUDO_LKM
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 2626905..291fa22 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mount.h	8.13 (Berkeley) 3/27/94
- *	$Id: mount.h,v 1.25 1995/08/28 09:19:05 julian Exp $
+ *	$Id: mount.h,v 1.26 1995/08/30 01:34:14 bde Exp $
  */
 
 #ifndef _SYS_MOUNT_H_
@@ -467,7 +467,7 @@ struct nfs_args {
 #endif /* NFS */
 
 #ifdef KERNEL
-extern	int (*mountroot) __P((caddr_t));
+extern	int (*mountroot) __P((void *));
 extern	struct vfsops	*mountrootvfsops;
 
 /*
@@ -483,7 +483,7 @@ struct	netcred *vfs_export_lookup	    /* lookup host in fs export list */
 	  __P((struct mount *, struct netexport *, struct mbuf *));
 int	vfs_lock __P((struct mount *));         /* lock a vfs */
 int	vfs_mountedon __P((struct vnode *));    /* is a vfs mounted on vp */
-int	vfs_mountroot __P((caddr_t));		/* XXX goes away? */
+int	vfs_mountroot __P((void *));		/* XXX goes away? */
 void	vfs_msync __P((struct mount *, int));
 void	vfs_unlock __P((struct mount *));       /* unlock a vfs */
 void	vfs_unmountall __P((void));
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index b570aa0..62eaf52 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -59,7 +59,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_glue.c,v 1.23 1995/07/13 08:48:21 davidg Exp $
+ * $Id: vm_glue.c,v 1.24 1995/08/28 09:19:22 julian Exp $
  */
 
 #include <sys/param.h>
@@ -87,15 +87,15 @@
  * Note: proc0 from proc.h
  */
 
-static void vm_init_limits __P((caddr_t));
-SYSINIT(vm_limits, SI_SUB_VM_CONF, SI_ORDER_FIRST, vm_init_limits, (caddr_t)&proc0)
+static void vm_init_limits __P((void *));
+SYSINIT(vm_limits, SI_SUB_VM_CONF, SI_ORDER_FIRST, vm_init_limits, &proc0)
 
 /*
  * THIS MUST BE THE LAST INITIALIZATION ITEM!!!
  *
  * Note: run scheduling should be divorced from the vm system.
  */
-static void scheduler __P((caddr_t));
+static void scheduler __P((void *));
 SYSINIT(scheduler, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, scheduler, NULL)
 
 
@@ -286,8 +286,8 @@ vm_fork(p1, p2, isvfork)
  * XXX should probably act directly on proc0.
  */
 static void
-vm_init_limits( udata)
-caddr_t		udata;
+vm_init_limits(udata)
+	void *udata;
 {
 	register struct proc *p = (struct proc *)udata;
 	int rss_limit;
@@ -364,8 +364,8 @@ faultin(p)
  */
 /* ARGSUSED*/
 static void
-scheduler( udata)
-caddr_t		udata;		/* not used*/
+scheduler(udata)
+	void *udata;		/* not used*/
 {
 	register struct proc *p;
 	register int pri;
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index ea41d94..ffe5daa 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_init.c,v 1.7 1995/07/13 08:48:24 davidg Exp $
+ * $Id: vm_init.c,v 1.8 1995/08/28 09:19:23 julian Exp $
  */
 
 /*
@@ -81,7 +81,7 @@
  * System initialization
  */
 
-static void vm_mem_init __P((caddr_t));
+static void vm_mem_init __P((void *));
 SYSINIT(vm_mem, SI_SUB_VM, SI_ORDER_FIRST, vm_mem_init, NULL)
 
 /*
@@ -93,8 +93,8 @@ SYSINIT(vm_mem, SI_SUB_VM, SI_ORDER_FIRST, vm_mem_init, NULL)
 
 /* ARGSUSED*/
 static void
-vm_mem_init( udata)
-caddr_t		udata;		/* not used*/
+vm_mem_init(udata)
+	void *udata;		/* not used*/
 {
 	/*
 	 * Initializes resident memory structures. From here on, all physical
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index e7ba408..9135ade 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -65,7 +65,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.c,v 1.53 1995/07/13 08:48:40 davidg Exp $
+ * $Id: vm_pageout.c,v 1.54 1995/08/28 09:19:24 julian Exp $
  */
 
 /*
@@ -102,7 +102,7 @@ static struct kproc_desc page_kp = {
 	vm_pageout,
 	&pageproc
 };
-SYSINIT_KT(pagedaemon, SI_SUB_KTHREAD_PAGE, SI_ORDER_FIRST, kproc_start, (caddr_t)&page_kp)
+SYSINIT_KT(pagedaemon, SI_SUB_KTHREAD_PAGE, SI_ORDER_FIRST, kproc_start, &page_kp)
 
 /* the kernel process "vm_daemon"*/
 static void vm_daemon __P((void));
@@ -113,7 +113,7 @@ static struct kproc_desc vm_kp = {
 	vm_daemon,
 	&vmproc
 };
-SYSINIT_KT(vmdaemon, SI_SUB_KTHREAD_VM, SI_ORDER_FIRST, kproc_start, (caddr_t)&vm_kp)
+SYSINIT_KT(vmdaemon, SI_SUB_KTHREAD_VM, SI_ORDER_FIRST, kproc_start, &vm_kp)
 
 
 int vm_pages_needed;		/* Event on which pageout daemon sleeps */
-- 
cgit v1.1