From b153f74628caaab019982b3fca98588d1395f14b Mon Sep 17 00:00:00 2001
From: Robert Garrett <rob@dragonflybsd.org>
Date: Wed, 20 Aug 2003 07:31:22 +0000
Subject: [PATCH] __P() != wanted, begin removal, in order to preserve white
 space this needs to be done by hand, as I accidently killed a source tree
 that I had gotten this far on. I'm committing this now, LINT and GENERIC both
 build with these changes, there are many more to come.

---
 sys/sys/acct.h         |   4 +-
 sys/sys/buf.h          | 114 ++++-----
 sys/sys/buf2.h         |  12 +-
 sys/sys/callout.h      |  10 +-
 sys/sys/cons.h         |  28 +--
 sys/sys/disk.h         |  12 +-
 sys/sys/disklabel.h    |  26 +-
 sys/sys/disklabel32.h  |  26 +-
 sys/sys/diskslice.h    |  30 +--
 sys/sys/domain.h       |  10 +-
 sys/sys/errno.h        |   4 +-
 sys/sys/event.h        |  14 +-
 sys/sys/eventhandler.h |   4 +-
 sys/sys/exec.h         |  12 +-
 sys/sys/fcntl.h        |  10 +-
 sys/sys/filedesc.h     |  44 ++--
 sys/sys/imgact.h       |  10 +-
 sys/sys/imgact_aout.h  |   4 +-
 sys/sys/imgact_elf.h   |  16 +-
 sys/sys/inflate.h      |   8 +-
 sys/sys/ioccom.h       |   4 +-
 sys/sys/ipc.h          |   6 +-
 sys/sys/jail.h         |   4 +-
 sys/sys/kernel.h       |  14 +-
 sys/sys/kthread.h      |  20 +-
 sys/sys/ktrace.h       |  18 +-
 sys/sys/libkern.h      |  40 +--
 sys/sys/link_aout.h    |  18 +-
 sys/sys/link_elf.h     |  18 +-
 sys/sys/lock.h         |  20 +-
 sys/sys/lockf.h        |   8 +-
 sys/sys/malloc.h       |  26 +-
 sys/sys/md5.h          |   4 +-
 sys/sys/mman.h         |  28 +--
 sys/sys/mount.h        | 160 ++++++------
 sys/sys/msg.h          |  12 +-
 sys/sys/msgbuf.h       |   4 +-
 sys/sys/namei.h        |  16 +-
 sys/sys/nlist_aout.h   |   4 +-
 sys/sys/odisklabel.h   |  26 +-
 sys/sys/param.h        |   4 +-
 sys/sys/poll.h         |   4 +-
 sys/sys/proc.h         |  84 +++----
 sys/sys/protosw.h      | 108 ++++-----
 sys/sys/ptrace.h       |  16 +-
 sys/sys/queue.h        |   6 +-
 sys/sys/resource.h     |  14 +-
 sys/sys/resourcevar.h  |  30 +--
 sys/sys/rtprio.h       |   4 +-
 sys/sys/select.h       |   6 +-
 sys/sys/sem.h          |  12 +-
 sys/sys/shm.h          |  16 +-
 sys/sys/signal.h       |  14 +-
 sys/sys/signalvar.h    |  36 +--
 sys/sys/socket.h       |  44 ++--
 sys/sys/socketvar.h    | 166 ++++++-------
 sys/sys/soundcard.h    |   4 +-
 sys/sys/stat.h         |  24 +-
 sys/sys/syscall-hide.h |   2 +-
 sys/sys/syscall.h      |   2 +-
 sys/sys/syscall.mk     |   2 +-
 sys/sys/sysctl.h       |   8 +-
 sys/sys/sysent.h       |  30 +--
 sys/sys/syslog.h       |  12 +-
 sys/sys/sysproto.h     | 540 ++++++++++++++++++++---------------------
 sys/sys/systm.h        | 288 +++++++++++-----------
 sys/sys/sysunion.h     |   2 +-
 sys/sys/termios.h      |  26 +-
 sys/sys/thread.h       |   4 +-
 sys/sys/time.h         |  58 ++---
 sys/sys/timeb.h        |   4 +-
 sys/sys/timepps.h      |  10 +-
 sys/sys/times.h        |   4 +-
 sys/sys/timex.h        |   8 +-
 sys/sys/tprintf.h      |   8 +-
 sys/sys/tty.h          |  98 ++++----
 sys/sys/types.h        |  10 +-
 sys/sys/ucred.h        |  22 +-
 sys/sys/uio.h          |  14 +-
 sys/sys/un.h           |  16 +-
 sys/sys/user.h         |   6 +-
 sys/sys/utsname.h      |   4 +-
 sys/sys/vnode.h        | 174 ++++++-------
 sys/sys/wait.h         |  10 +-
 84 files changed, 1401 insertions(+), 1401 deletions(-)

diff --git a/sys/sys/acct.h b/sys/sys/acct.h
index 37cccea71a..499e6778ac 100644
--- a/sys/sys/acct.h
+++ b/sys/sys/acct.h
@@ -37,7 +37,7 @@
  *
  *	@(#)acct.h	8.4 (Berkeley) 1/9/95
  * $FreeBSD: src/sys/sys/acct.h,v 1.12 1999/12/29 04:24:36 peter Exp $
- * $DragonFly: src/sys/sys/acct.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/acct.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_ACCT_H_
@@ -87,7 +87,7 @@ struct acct {
 #ifdef _KERNEL
 struct proc;
 
-int	acct_process __P((struct proc *p));
+int	acct_process (struct proc *p);
 #endif
 
 #endif /* !_SYS_ACCT_H_ */
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index f0b6a305f4..514ee3e390 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -37,7 +37,7 @@
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
  * $FreeBSD: src/sys/sys/buf.h,v 1.88.2.10 2003/01/25 19:02:23 dillon Exp $
- * $DragonFly: src/sys/sys/buf.h,v 1.6 2003/07/22 17:03:34 dillon Exp $
+ * $DragonFly: src/sys/sys/buf.h,v 1.7 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_BUF_H_
@@ -68,18 +68,18 @@ LIST_HEAD(workhead, worklist);
  * to each buffer.
  */
 extern struct bio_ops {
-	void	(*io_start) __P((struct buf *));
-	void	(*io_complete) __P((struct buf *));
-	void	(*io_deallocate) __P((struct buf *));
-	int	(*io_fsync) __P((struct vnode *));
-	int	(*io_sync) __P((struct mount *));
-	void	(*io_movedeps) __P((struct buf *, struct buf *));
-	int	(*io_countdeps) __P((struct buf *, int));
+	void	(*io_start) (struct buf *);
+	void	(*io_complete) (struct buf *);
+	void	(*io_deallocate) (struct buf *);
+	int	(*io_fsync) (struct vnode *);
+	int	(*io_sync) (struct mount *);
+	void	(*io_movedeps) (struct buf *, struct buf *);
+	int	(*io_countdeps) (struct buf *, int);
 } bioops;
 
 struct iodone_chain {
 	long	ic_prev_flags;
-	void	(*ic_prev_iodone) __P((struct buf *));
+	void	(*ic_prev_iodone) (struct buf *);
 	void	*ic_prev_iodone_chain;
 	struct {
 		long	ia_long;
@@ -125,7 +125,7 @@ struct buf {
 	daddr_t	b_blkno;		/* Underlying physical block number. */
 	off_t	b_offset;		/* Offset into file */
 					/* Function to call upon completion. */
-	void	(*b_iodone) __P((struct buf *));
+	void	(*b_iodone) (struct buf *);
 					/* For nested b_iodone's. */
 	struct	iodone_chain *b_iodone_chain;
 	struct	vnode *b_vp;		/* Device vnode. */
@@ -339,56 +339,56 @@ extern TAILQ_HEAD(bqueues, buf) bufqueues[BUFFER_QUEUES];
 
 struct uio;
 
-caddr_t bufhashinit __P((caddr_t));
-void	bufinit __P((void));
-void	bwillwrite __P((void));
-int	buf_dirty_count_severe __P((void));
-void	bremfree __P((struct buf *));
-int	bread __P((struct vnode *, daddr_t, int, struct buf **));
-int	breadn __P((struct vnode *, daddr_t, int, daddr_t *, int *, int,
-	    struct buf **));
-int	bwrite __P((struct buf *));
-void	bdwrite __P((struct buf *));
-void	bawrite __P((struct buf *));
-void	bdirty __P((struct buf *));
-void	bundirty __P((struct buf *));
-int	bowrite __P((struct buf *));
-void	brelse __P((struct buf *));
-void	bqrelse __P((struct buf *));
-int	vfs_bio_awrite __P((struct buf *));
-struct buf *     getpbuf __P((int *));
-struct buf *incore __P((struct vnode *, daddr_t));
-struct buf *gbincore __P((struct vnode *, daddr_t));
-int	inmem __P((struct vnode *, daddr_t));
-struct buf *getblk __P((struct vnode *, daddr_t, int, int, int));
-struct buf *geteblk __P((int));
-int	biowait __P((struct buf *));
-void	biodone __P((struct buf *));
+caddr_t bufhashinit (caddr_t);
+void	bufinit (void);
+void	bwillwrite (void);
+int	buf_dirty_count_severe (void);
+void	bremfree (struct buf *);
+int	bread (struct vnode *, daddr_t, int, struct buf **);
+int	breadn (struct vnode *, daddr_t, int, daddr_t *, int *, int,
+	    struct buf **);
+int	bwrite (struct buf *);
+void	bdwrite (struct buf *);
+void	bawrite (struct buf *);
+void	bdirty (struct buf *);
+void	bundirty (struct buf *);
+int	bowrite (struct buf *);
+void	brelse (struct buf *);
+void	bqrelse (struct buf *);
+int	vfs_bio_awrite (struct buf *);
+struct buf *     getpbuf (int *);
+struct buf *incore (struct vnode *, daddr_t);
+struct buf *gbincore (struct vnode *, daddr_t);
+int	inmem (struct vnode *, daddr_t);
+struct buf *getblk (struct vnode *, daddr_t, int, int, int);
+struct buf *geteblk (int);
+int	biowait (struct buf *);
+void	biodone (struct buf *);
 
-void	cluster_callback __P((struct buf *));
-int	cluster_read __P((struct vnode *, u_quad_t, daddr_t, long,
-	    long, int, struct buf **));
-int	cluster_wbuild __P((struct vnode *, long, daddr_t, int));
-void	cluster_write __P((struct buf *, u_quad_t, int));
-int	physio __P((dev_t dev, struct uio *uio, int ioflag));
+void	cluster_callback (struct buf *);
+int	cluster_read (struct vnode *, u_quad_t, daddr_t, long,
+	    long, int, struct buf **);
+int	cluster_wbuild (struct vnode *, long, daddr_t, int);
+void	cluster_write (struct buf *, u_quad_t, int);
+int	physio (dev_t dev, struct uio *uio, int ioflag);
 #define physread physio
 #define physwrite physio
-void	vfs_bio_set_validclean __P((struct buf *, int base, int size));
-void	vfs_bio_clrbuf __P((struct buf *));
-void	vfs_busy_pages __P((struct buf *, int clear_modify));
-void	vfs_unbusy_pages __P((struct buf *));
-void	vwakeup __P((struct buf *));
-int	vmapbuf __P((struct buf *));
-void	vunmapbuf __P((struct buf *));
-void	relpbuf __P((struct buf *, int *));
-void	brelvp __P((struct buf *));
-void	bgetvp __P((struct vnode *, struct buf *));
-void	pbgetvp __P((struct vnode *, struct buf *));
-void	pbrelvp __P((struct buf *));
-int	allocbuf __P((struct buf *bp, int size));
-void	reassignbuf __P((struct buf *, struct vnode *));
-void	pbreassignbuf __P((struct buf *, struct vnode *));
-struct	buf *trypbuf __P((int *));
+void	vfs_bio_set_validclean (struct buf *, int base, int size);
+void	vfs_bio_clrbuf (struct buf *);
+void	vfs_busy_pages (struct buf *, int clear_modify);
+void	vfs_unbusy_pages (struct buf *);
+void	vwakeup (struct buf *);
+int	vmapbuf (struct buf *);
+void	vunmapbuf (struct buf *);
+void	relpbuf (struct buf *, int *);
+void	brelvp (struct buf *);
+void	bgetvp (struct vnode *, struct buf *);
+void	pbgetvp (struct vnode *, struct buf *);
+void	pbrelvp (struct buf *);
+int	allocbuf (struct buf *bp, int size);
+void	reassignbuf (struct buf *, struct vnode *);
+void	pbreassignbuf (struct buf *, struct vnode *);
+struct	buf *trypbuf (int *);
 
 #endif /* _KERNEL */
 
diff --git a/sys/sys/buf2.h b/sys/sys/buf2.h
index 98ff4e6eed..deda22326c 100644
--- a/sys/sys/buf2.h
+++ b/sys/sys/buf2.h
@@ -37,7 +37,7 @@
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
  * $FreeBSD: src/sys/sys/buf.h,v 1.88.2.10 2003/01/25 19:02:23 dillon Exp $
- * $DragonFly: src/sys/sys/buf2.h,v 1.5 2003/07/23 02:30:24 dillon Exp $
+ * $DragonFly: src/sys/sys/buf2.h,v 1.6 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_BUF2_H_
@@ -59,7 +59,7 @@
  *
  * Get a lock sleeping non-interruptably until it becomes available.
  */
-static __inline int BUF_LOCK __P((struct buf *, int));
+static __inline int BUF_LOCK (struct buf *, int);
 static __inline int
 BUF_LOCK(struct buf *bp, int locktype)
 {
@@ -78,7 +78,7 @@ BUF_LOCK(struct buf *bp, int locktype)
 /*
  * Get a lock sleeping with specified interruptably and timeout.
  */
-static __inline int BUF_TIMELOCK __P((struct buf *, int, char *, int, int));
+static __inline int BUF_TIMELOCK (struct buf *, int, char *, int, int);
 static __inline int
 BUF_TIMELOCK(struct buf *bp, int locktype, char *wmesg, int catch, int timo)
 {
@@ -98,7 +98,7 @@ BUF_TIMELOCK(struct buf *bp, int locktype, char *wmesg, int catch, int timo)
  * Release a lock. Only the acquiring process may free the lock unless
  * it has been handed off to biodone.
  */
-static __inline void BUF_UNLOCK __P((struct buf *));
+static __inline void BUF_UNLOCK (struct buf *);
 static __inline void
 BUF_UNLOCK(struct buf *bp)
 {
@@ -121,7 +121,7 @@ BUF_UNLOCK(struct buf *bp)
  * original owning process can no longer acquire it recursively, but must
  * wait until the I/O is completed and the lock has been freed by biodone.
  */
-static __inline void BUF_KERNPROC __P((struct buf *));
+static __inline void BUF_KERNPROC (struct buf *);
 static __inline void
 BUF_KERNPROC(struct buf *bp)
 {
@@ -134,7 +134,7 @@ BUF_KERNPROC(struct buf *bp)
 /*
  * Find out the number of references to a lock.
  */
-static __inline int BUF_REFCNT __P((struct buf *));
+static __inline int BUF_REFCNT (struct buf *);
 static __inline int
 BUF_REFCNT(struct buf *bp)
 {
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index bc631e609c..74bbb7f3a1 100644
--- a/sys/sys/callout.h
+++ b/sys/sys/callout.h
@@ -37,7 +37,7 @@
  *
  *	@(#)callout.h	8.2 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/sys/callout.h,v 1.15.2.1 2001/11/13 18:24:52 archie Exp $
- * $DragonFly: src/sys/sys/callout.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/callout.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_CALLOUT_H_
@@ -55,7 +55,7 @@ struct callout {
 	} c_links;
 	int	c_time;				/* ticks to the event */
 	void	*c_arg;				/* function argument */
-	void	(*c_func) __P((void *));	/* function to call */
+	void	(*c_func) (void *);	/* function to call */
 	int	c_flags;			/* state of this entry */
 };
 
@@ -76,10 +76,10 @@ extern int	callwheelsize, callwheelbits, callwheelmask, softticks;
 
 #define	callout_active(c)	((c)->c_flags & CALLOUT_ACTIVE)
 #define	callout_deactivate(c)	((c)->c_flags &= ~CALLOUT_ACTIVE)
-void	callout_init __P((struct callout *));
+void	callout_init (struct callout *);
 #define	callout_pending(c)	((c)->c_flags & CALLOUT_PENDING)
-void	callout_reset __P((struct callout *, int, void (*)(void *), void *));
-int	callout_stop __P((struct callout *));
+void	callout_reset (struct callout *, int, void (*)(void *), void *);
+int	callout_stop (struct callout *);
 
 #endif
 
diff --git a/sys/sys/cons.h b/sys/sys/cons.h
index 2461e37741..f74fa410d5 100644
--- a/sys/sys/cons.h
+++ b/sys/sys/cons.h
@@ -37,20 +37,20 @@
  *
  *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/sys/cons.h,v 1.24 2000/01/11 14:54:01 yokota Exp $
- * $DragonFly: src/sys/sys/cons.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/cons.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _MACHINE_CONS_H_
 #define	_MACHINE_CONS_H_
 
 struct consdev;
-typedef	void	cn_probe_t __P((struct consdev *));
-typedef	void	cn_init_t __P((struct consdev *));
-typedef	void	cn_term_t __P((struct consdev *));
-typedef	int	cn_getc_t __P((dev_t));
-typedef	int	cn_checkc_t __P((dev_t));
-typedef	void	cn_putc_t __P((dev_t, int));
-typedef	void	cn_dbctl_t __P((dev_t, int));
+typedef	void	cn_probe_t (struct consdev *);
+typedef	void	cn_init_t (struct consdev *);
+typedef	void	cn_term_t (struct consdev *);
+typedef	int	cn_getc_t (dev_t);
+typedef	int	cn_checkc_t (dev_t);
+typedef	void	cn_putc_t (dev_t, int);
+typedef	void	cn_dbctl_t (dev_t, int);
 
 struct consdev {
 	cn_probe_t	*cn_probe;
@@ -90,12 +90,12 @@ extern	struct consdev *cn_tab;
 	DATA_SET(cons_set, name##_consdev)
 
 /* Other kernel entry points. */
-int	cncheckc __P((void));
-int	cngetc __P((void));
-void	cninit __P((void));
-void	cninit_finish __P((void));
-void	cndbctl __P((int));
-void	cnputc __P((int));
+int	cncheckc (void);
+int	cngetc (void);
+void	cninit (void);
+void	cninit_finish (void);
+void	cndbctl (int);
+void	cnputc (int);
 
 #endif /* _KERNEL */
 
diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index 29e730c234..e4691c6440 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -7,7 +7,7 @@
  * ----------------------------------------------------------------------------
  *
  * $FreeBSD: src/sys/sys/disk.h,v 1.16.2.3 2001/06/20 16:11:01 scottl Exp $
- * $DragonFly: src/sys/sys/disk.h,v 1.3 2003/07/22 17:03:34 dillon Exp $
+ * $DragonFly: src/sys/sys/disk.h,v 1.4 2003/08/20 07:31:21 rob Exp $
  *
  */
 
@@ -40,10 +40,10 @@ struct disk {
 #define DISKFLAG_LOCK		0x1
 #define DISKFLAG_WANTED		0x2
 
-dev_t disk_create __P((int unit, struct disk *disk, int flags, struct cdevsw *cdevsw));
-void disk_destroy __P((struct disk *disk));
-int disk_dumpcheck __P((dev_t dev, u_int *count, u_int *blkno, u_int *secsize));
-struct disk *disk_enumerate __P((struct disk *disk));
-void disk_invalidate __P((struct disk *disk));
+dev_t disk_create (int unit, struct disk *disk, int flags, struct cdevsw *cdevsw);
+void disk_destroy (struct disk *disk);
+int disk_dumpcheck (dev_t dev, u_int *count, u_int *blkno, u_int *secsize);
+struct disk *disk_enumerate (struct disk *disk);
+void disk_invalidate (struct disk *disk);
 
 #endif /* _SYS_DISK_H_ */
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index b06b40cb7e..3d02ae9985 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -32,7 +32,7 @@
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
  * $FreeBSD: src/sys/sys/disklabel.h,v 1.49.2.7 2001/05/27 05:58:26 jkh Exp $
- * $DragonFly: src/sys/sys/disklabel.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/disklabel.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_DISKLABEL_H_
@@ -463,18 +463,18 @@ dkunit(dev_t dev)
 struct	buf;
 struct	buf_queue_head;
 
-int	bounds_check_with_label __P((struct buf *bp, struct disklabel *lp,
-				     int wlabel));
-void	diskerr __P((struct buf *bp, char *what, int pri, int blkdone,
-		     struct disklabel *lp));
-void	disksort __P((struct buf *ap, struct buf *bp));
-char	*readdisklabel __P((dev_t dev, struct disklabel *lp));
-void	bufqdisksort __P((struct buf_queue_head *ap, struct buf *bp));
-int	setdisklabel __P((struct disklabel *olp, struct disklabel *nlp,
-			  u_long openmask));
-int	writedisklabel __P((dev_t dev, struct disklabel *lp));
+int	bounds_check_with_label (struct buf *bp, struct disklabel *lp,
+				     int wlabel);
+void	diskerr (struct buf *bp, char *what, int pri, int blkdone,
+		     struct disklabel *lp);
+void	disksort (struct buf *ap, struct buf *bp);
+char	*readdisklabel (dev_t dev, struct disklabel *lp);
+void	bufqdisksort (struct buf_queue_head *ap, struct buf *bp);
+int	setdisklabel (struct disklabel *olp, struct disklabel *nlp,
+			  u_long openmask);
+int	writedisklabel (dev_t dev, struct disklabel *lp);
 #ifdef __alpha__
-void	alpha_fix_srm_checksum __P((struct buf *bp));
+void	alpha_fix_srm_checksum (struct buf *bp);
 #endif
 
 #endif /* _KERNEL */
@@ -483,7 +483,7 @@ void	alpha_fix_srm_checksum __P((struct buf *bp));
 
 #ifndef _KERNEL
 __BEGIN_DECLS
-struct disklabel *getdiskbyname __P((const char *));
+struct disklabel *getdiskbyname (const char *);
 __END_DECLS
 #endif
 
diff --git a/sys/sys/disklabel32.h b/sys/sys/disklabel32.h
index 159ed3ff17..19c7229969 100644
--- a/sys/sys/disklabel32.h
+++ b/sys/sys/disklabel32.h
@@ -32,7 +32,7 @@
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
  * $FreeBSD: src/sys/sys/disklabel.h,v 1.49.2.7 2001/05/27 05:58:26 jkh Exp $
- * $DragonFly: src/sys/sys/disklabel32.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/disklabel32.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_DISKLABEL_H_
@@ -463,18 +463,18 @@ dkunit(dev_t dev)
 struct	buf;
 struct	buf_queue_head;
 
-int	bounds_check_with_label __P((struct buf *bp, struct disklabel *lp,
-				     int wlabel));
-void	diskerr __P((struct buf *bp, char *what, int pri, int blkdone,
-		     struct disklabel *lp));
-void	disksort __P((struct buf *ap, struct buf *bp));
-char	*readdisklabel __P((dev_t dev, struct disklabel *lp));
-void	bufqdisksort __P((struct buf_queue_head *ap, struct buf *bp));
-int	setdisklabel __P((struct disklabel *olp, struct disklabel *nlp,
-			  u_long openmask));
-int	writedisklabel __P((dev_t dev, struct disklabel *lp));
+int	bounds_check_with_label (struct buf *bp, struct disklabel *lp,
+				     int wlabel);
+void	diskerr (struct buf *bp, char *what, int pri, int blkdone,
+		     struct disklabel *lp);
+void	disksort (struct buf *ap, struct buf *bp);
+char	*readdisklabel (dev_t dev, struct disklabel *lp);
+void	bufqdisksort (struct buf_queue_head *ap, struct buf *bp);
+int	setdisklabel (struct disklabel *olp, struct disklabel *nlp,
+			  u_long openmask);
+int	writedisklabel (dev_t dev, struct disklabel *lp);
 #ifdef __alpha__
-void	alpha_fix_srm_checksum __P((struct buf *bp));
+void	alpha_fix_srm_checksum (struct buf *bp);
 #endif
 
 #endif /* _KERNEL */
@@ -483,7 +483,7 @@ void	alpha_fix_srm_checksum __P((struct buf *bp));
 
 #ifndef _KERNEL
 __BEGIN_DECLS
-struct disklabel *getdiskbyname __P((const char *));
+struct disklabel *getdiskbyname (const char *);
 __END_DECLS
 #endif
 
diff --git a/sys/sys/diskslice.h b/sys/sys/diskslice.h
index 74aa7b27f8..ba26fded47 100644
--- a/sys/sys/diskslice.h
+++ b/sys/sys/diskslice.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/diskslice.h,v 1.36.2.1 2001/01/29 01:50:50 ken Exp $
- * $DragonFly: src/sys/sys/diskslice.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/diskslice.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef	_SYS_DISKSLICE_H_
@@ -88,20 +88,20 @@ struct diskslices {
 struct buf;
 struct disklabel;
 
-int	dscheck __P((struct buf *bp, struct diskslices *ssp));
-void	dsclose __P((dev_t dev, int mode, struct diskslices *ssp));
-void	dsgone __P((struct diskslices **sspp));
-int	dsinit __P((dev_t dev, struct disklabel *lp,
-		     struct diskslices **sspp));
-int	dsioctl __P((dev_t dev, u_long cmd, caddr_t data,
-		     int flags, struct diskslices **sspp));
-int	dsisopen __P((struct diskslices *ssp));
-struct diskslices *dsmakeslicestruct __P((int nslices, struct disklabel *lp));
-char	*dsname __P((dev_t dev, int unit, int slice, int part,
-		     char *partname));
-int	dsopen __P((dev_t dev, int mode, u_int flags,
-		    struct diskslices **sspp, struct disklabel *lp));
-int	dssize __P((dev_t dev, struct diskslices **sspp));
+int	dscheck (struct buf *bp, struct diskslices *ssp);
+void	dsclose (dev_t dev, int mode, struct diskslices *ssp);
+void	dsgone (struct diskslices **sspp);
+int	dsinit (dev_t dev, struct disklabel *lp,
+		     struct diskslices **sspp);
+int	dsioctl (dev_t dev, u_long cmd, caddr_t data,
+		     int flags, struct diskslices **sspp);
+int	dsisopen (struct diskslices *ssp);
+struct diskslices *dsmakeslicestruct (int nslices, struct disklabel *lp);
+char	*dsname (dev_t dev, int unit, int slice, int part,
+		     char *partname);
+int	dsopen (dev_t dev, int mode, u_int flags,
+		    struct diskslices **sspp, struct disklabel *lp);
+int	dssize (dev_t dev, struct diskslices **sspp);
 
 #endif /* _KERNEL */
 
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
index b9fb687159..10c642b886 100644
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -32,7 +32,7 @@
  *
  *	@(#)domain.h	8.1 (Berkeley) 6/2/93
  * $FreeBSD: src/sys/sys/domain.h,v 1.14 1999/12/29 04:24:40 peter Exp $
- * $DragonFly: src/sys/sys/domain.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/domain.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_DOMAIN_H_
@@ -51,15 +51,15 @@ struct	domain {
 	int	dom_family;		/* AF_xxx */
 	char	*dom_name;
 	void	(*dom_init)		/* initialize domain data structures */
-		__P((void));
+		(void);
 	int	(*dom_externalize)	/* externalize access rights */
-		__P((struct mbuf *));
+		(struct mbuf *);
 	void	(*dom_dispose)		/* dispose of internalized rights */
-		__P((struct mbuf *));
+		(struct mbuf *);
 	struct	protosw *dom_protosw, *dom_protoswNPROTOSW;
 	struct	domain *dom_next;
 	int	(*dom_rtattach)		/* initialize routing table */
-		__P((void **, int));
+		(void **, int);
 	int	dom_rtoffset;		/* an arg to rtattach, in bits */
 	int	dom_maxrtkey;		/* for routing layer */
 };
diff --git a/sys/sys/errno.h b/sys/sys/errno.h
index 3c26fc9233..964890ed59 100644
--- a/sys/sys/errno.h
+++ b/sys/sys/errno.h
@@ -37,7 +37,7 @@
  *
  *	@(#)errno.h	8.5 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/sys/errno.h,v 1.14.2.2 2002/01/22 10:46:56 keramida Exp $
- * $DragonFly: src/sys/sys/errno.h,v 1.3 2003/07/24 23:52:39 dillon Exp $
+ * $DragonFly: src/sys/sys/errno.h,v 1.4 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_ERRNO_H_
@@ -46,7 +46,7 @@
 #ifndef _KERNEL
 #include <sys/cdefs.h>
 __BEGIN_DECLS
-int *	__error __P((void));
+int *	__error (void);
 __END_DECLS
 #define	errno		(* __error())
 #endif
diff --git a/sys/sys/event.h b/sys/sys/event.h
index 65cd1ff1e6..1a7e9a3b60 100644
--- a/sys/sys/event.h
+++ b/sys/sys/event.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/sys/event.h,v 1.5.2.6 2003/02/09 15:28:13 nectar Exp $
- *	$DragonFly: src/sys/sys/event.h,v 1.3 2003/06/25 03:56:10 dillon Exp $
+ *	$DragonFly: src/sys/sys/event.h,v 1.4 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_EVENT_H_
@@ -130,9 +130,9 @@ MALLOC_DECLARE(M_KQUEUE);
 
 struct filterops {
 	int	f_isfd;		/* true if ident == filedescriptor */
-	int	(*f_attach)	__P((struct knote *kn));
-	void	(*f_detach)	__P((struct knote *kn));
-	int	(*f_event)	__P((struct knote *kn, long hint));
+	int	(*f_attach)	(struct knote *kn);
+	void	(*f_detach)	(struct knote *kn);
+	int	(*f_event)	(struct knote *kn, long hint);
 };
 
 struct knote {
@@ -178,10 +178,10 @@ extern int 	kqueue_register(struct kqueue *kq,
 struct timespec;
 
 __BEGIN_DECLS
-int     kqueue __P((void));
-int     kevent __P((int kq, const struct kevent *changelist, int nchanges,
+int     kqueue (void);
+int     kevent (int kq, const struct kevent *changelist, int nchanges,
 		    struct kevent *eventlist, int nevents,
-		    const struct timespec *timeout));
+		    const struct timespec *timeout);
 __END_DECLS
 
 #endif /* !_KERNEL */
diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h
index 00b244946d..de7124df19 100644
--- a/sys/sys/eventhandler.h
+++ b/sys/sys/eventhandler.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/eventhandler.h,v 1.5 2000/01/16 06:11:33 bde Exp $
- * $DragonFly: src/sys/sys/eventhandler.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/eventhandler.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #include <sys/queue.h>
@@ -146,7 +146,7 @@ extern struct eventhandler_list	*eventhandler_find_list(char *name);
  */
 
 /* Shutdown events */
-typedef void (*shutdown_fn) __P((void *, int));
+typedef void (*shutdown_fn) (void *, int);
 
 #define	SHUTDOWN_PRI_FIRST	0
 #define	SHUTDOWN_PRI_DEFAULT	10000
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index adebc879f2..18ca67a795 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -37,7 +37,7 @@
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/sys/exec.h,v 1.26 1999/12/29 04:24:40 peter Exp $
- * $DragonFly: src/sys/sys/exec.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/exec.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_EXEC_H_
@@ -67,7 +67,7 @@ struct ps_strings {
 struct image_params;
 
 struct execsw {
-	int (*ex_imgact) __P((struct image_params *));
+	int (*ex_imgact) (struct image_params *);
 	const char *ex_name;
 };
 
@@ -76,11 +76,11 @@ struct execsw {
 #ifdef _KERNEL
 #include <sys/cdefs.h>
 
-int exec_map_first_page __P((struct image_params *));        
-void exec_unmap_first_page __P((struct image_params *));       
+int exec_map_first_page (struct image_params *);        
+void exec_unmap_first_page (struct image_params *);       
 
-int exec_register __P((const struct execsw *));
-int exec_unregister __P((const struct execsw *));
+int exec_register (const struct execsw *);
+int exec_unregister (const struct execsw *);
 
 /*
  * note: name##_mod cannot be const storage because the
diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h
index 053359683c..46365a243a 100644
--- a/sys/sys/fcntl.h
+++ b/sys/sys/fcntl.h
@@ -37,7 +37,7 @@
  *
  *	@(#)fcntl.h	8.3 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/sys/fcntl.h,v 1.9.2.2 2001/06/03 05:00:10 dillon Exp $
- * $DragonFly: src/sys/sys/fcntl.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/fcntl.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_FCNTL_H_
@@ -200,11 +200,11 @@ struct flock {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	open __P((const char *, int, ...));
-int	creat __P((const char *, mode_t));
-int	fcntl __P((int, int, ...));
+int	open (const char *, int, ...);
+int	creat (const char *, mode_t);
+int	fcntl (int, int, ...);
 #ifndef _POSIX_SOURCE
-int	flock __P((int, int));
+int	flock (int, int);
 #endif /* !_POSIX_SOURCE */
 __END_DECLS
 #endif
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index b3db9cd9c3..50dbffba43 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -32,7 +32,7 @@
  *
  *	@(#)filedesc.h	8.1 (Berkeley) 6/2/93
  * $FreeBSD: src/sys/sys/filedesc.h,v 1.19.2.5 2003/06/06 20:21:32 tegge Exp $
- * $DragonFly: src/sys/sys/filedesc.h,v 1.4 2003/06/25 03:56:10 dillon Exp $
+ * $DragonFly: src/sys/sys/filedesc.h,v 1.5 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_FILEDESC_H_
@@ -157,27 +157,27 @@ struct proc;
 /*
  * Kernel global variables and routines.
  */
-int	dupfdopen __P((struct filedesc *, int, int, int, int));
-int	fdalloc __P((struct proc *p, int want, int *result));
-int	fdavail __P((struct proc *p, int n));
-int	falloc __P((struct proc *p, struct file **resultfp, int *resultfd));
-void	ffree __P((struct file *));
-struct	filedesc *fdinit __P((struct proc *p));
-struct	filedesc *fdshare __P((struct proc *p));
-struct	filedesc *fdcopy __P((struct proc *p));
-void	fdfree __P((struct proc *p));
-int	closef __P((struct file *fp, struct thread *td));
-void	fdcloseexec __P((struct proc *p));
-int	fdcheckstd __P((struct proc *p));
-struct	file *holdfp __P((struct filedesc *fdp, int fd, int flag));
-int	getvnode __P((struct filedesc *fdp, int fd, struct file **fpp));
-int	fdissequential __P((struct file *));
-void	fdsequential __P((struct file *, int));
-pid_t	fgetown __P((struct sigio *));
-int	fsetown __P((pid_t, struct sigio **));
-void	funsetown __P((struct sigio *));
-void	funsetownlst __P((struct sigiolst *));
-void	setugidsafety __P((struct proc *p));
+int	dupfdopen (struct filedesc *, int, int, int, int);
+int	fdalloc (struct proc *p, int want, int *result);
+int	fdavail (struct proc *p, int n);
+int	falloc (struct proc *p, struct file **resultfp, int *resultfd);
+void	ffree (struct file *);
+struct	filedesc *fdinit (struct proc *p);
+struct	filedesc *fdshare (struct proc *p);
+struct	filedesc *fdcopy (struct proc *p);
+void	fdfree (struct proc *p);
+int	closef (struct file *fp, struct thread *td);
+void	fdcloseexec (struct proc *p);
+int	fdcheckstd (struct proc *p);
+struct	file *holdfp (struct filedesc *fdp, int fd, int flag);
+int	getvnode (struct filedesc *fdp, int fd, struct file **fpp);
+int	fdissequential (struct file *);
+void	fdsequential (struct file *, int);
+pid_t	fgetown (struct sigio *);
+int	fsetown (pid_t, struct sigio **);
+void	funsetown (struct sigio *);
+void	funsetownlst (struct sigiolst *);
+void	setugidsafety (struct proc *p);
 
 struct filedesc_to_leader *
 filedesc_to_leader_alloc(struct filedesc_to_leader *old,
diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h
index c78b4b80ae..e8afd54519 100644
--- a/sys/sys/imgact.h
+++ b/sys/sys/imgact.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/imgact.h,v 1.22.2.2 2001/12/22 01:21:44 jwd Exp $
- * $DragonFly: src/sys/sys/imgact.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/imgact.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_IMGACT_H_
@@ -62,10 +62,10 @@ struct image_params {
 };
 
 #ifdef _KERNEL
-int	exec_check_permissions __P((struct image_params *));
-int	exec_extract_strings __P((struct image_params *));
-int	exec_new_vmspace __P((struct image_params *));
-int	exec_shell_imgact __P((struct image_params *));
+int	exec_check_permissions (struct image_params *);
+int	exec_extract_strings (struct image_params *);
+int	exec_new_vmspace (struct image_params *);
+int	exec_shell_imgact (struct image_params *);
 #endif
 
 #endif /* !_SYS_IMGACT_H_ */
diff --git a/sys/sys/imgact_aout.h b/sys/sys/imgact_aout.h
index 3be51ab7d2..0314d5db20 100644
--- a/sys/sys/imgact_aout.h
+++ b/sys/sys/imgact_aout.h
@@ -32,7 +32,7 @@
  *
  *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93
  * $FreeBSD: src/sys/sys/imgact_aout.h,v 1.13 1999/12/29 04:24:41 peter Exp $
- * $DragonFly: src/sys/sys/imgact_aout.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/imgact_aout.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef	_IMGACT_AOUT_H_
@@ -151,7 +151,7 @@ struct exec {
 #ifdef _KERNEL
 struct proc;
 
-int	aout_coredump __P((struct proc *p, struct vnode *vp, off_t limit));
+int	aout_coredump (struct proc *p, struct vnode *vp, off_t limit);
 #endif
 
 #endif /* !_IMGACT_AOUT_H_ */
diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h
index 2127d88433..5596ffa9d7 100644
--- a/sys/sys/imgact_elf.h
+++ b/sys/sys/imgact_elf.h
@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/imgact_elf.h,v 1.17.2.1 2000/07/06 22:26:40 obrien Exp $
- * $DragonFly: src/sys/sys/imgact_elf.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/imgact_elf.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_IMGACT_ELF_H_
@@ -66,9 +66,9 @@ typedef struct {
 
 #define MAX_BRANDS      8
 
-int	elf_brand_inuse        __P((Elf32_Brandinfo *entry));
-int	elf_insert_brand_entry __P((Elf32_Brandinfo *entry));
-int	elf_remove_brand_entry __P((Elf32_Brandinfo *entry));
+int	elf_brand_inuse        (Elf32_Brandinfo *entry);
+int	elf_insert_brand_entry (Elf32_Brandinfo *entry);
+int	elf_remove_brand_entry (Elf32_Brandinfo *entry);
 
 #else /* !(ELF_TARG_CLASS == ELFCLASS32) */
 
@@ -98,15 +98,15 @@ typedef struct {
 
 #define MAX_BRANDS      8
 
-int	elf_brand_inuse        __P((Elf64_Brandinfo *entry));
-int	elf_insert_brand_entry __P((Elf64_Brandinfo *entry));
-int	elf_remove_brand_entry __P((Elf64_Brandinfo *entry));
+int	elf_brand_inuse        (Elf64_Brandinfo *entry);
+int	elf_insert_brand_entry (Elf64_Brandinfo *entry);
+int	elf_remove_brand_entry (Elf64_Brandinfo *entry);
 
 #endif /* ELF_TARG_CLASS == ELFCLASS32 */
 
 struct proc;
 
-int	elf_coredump __P((struct proc *, struct vnode *, off_t));
+int	elf_coredump (struct proc *, struct vnode *, off_t);
 
 #endif /* _KERNEL */
 
diff --git a/sys/sys/inflate.h b/sys/sys/inflate.h
index cf0a2a3cda..1472782f59 100644
--- a/sys/sys/inflate.h
+++ b/sys/sys/inflate.h
@@ -7,7 +7,7 @@
  * ----------------------------------------------------------------------------
  *
  * $FreeBSD: src/sys/sys/inflate.h,v 1.11 1999/12/29 04:24:42 peter Exp $
- * $DragonFly: src/sys/sys/inflate.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/inflate.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  *
  */
 #ifndef	_SYS_INFLATE_H_
@@ -30,10 +30,10 @@ struct inflate {
 	void           *gz_private;
 
 	/* Fetch next character to be uncompressed */
-	int             (*gz_input) __P((void *));
+	int             (*gz_input) (void *);
 
 	/* Dispose of uncompressed characters */
-	int             (*gz_output) __P((void *, u_char *, u_long));
+	int             (*gz_output) (void *, u_char *, u_long);
 
 	/* Private part */
 	u_long          gz_bb;	/* bit buffer */
@@ -47,7 +47,7 @@ struct inflate {
 	unsigned        gz_wp;
 };
 
-int inflate     __P((struct inflate *));
+int inflate     (struct inflate *);
 
 #endif	/* _KERNEL || KZIP */
 
diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h
index 453456e3d0..5995afdd9b 100644
--- a/sys/sys/ioccom.h
+++ b/sys/sys/ioccom.h
@@ -32,7 +32,7 @@
  *
  *	@(#)ioccom.h	8.2 (Berkeley) 3/28/94
  * $FreeBSD: src/sys/sys/ioccom.h,v 1.9 1999/12/29 04:24:42 peter Exp $
- * $DragonFly: src/sys/sys/ioccom.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/ioccom.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef	_SYS_IOCCOM_H_
@@ -68,7 +68,7 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	ioctl __P((int, unsigned long, ...));
+int	ioctl (int, unsigned long, ...);
 __END_DECLS
 
 #endif
diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h
index 0ed249a49b..e6656c548b 100644
--- a/sys/sys/ipc.h
+++ b/sys/sys/ipc.h
@@ -42,7 +42,7 @@
  *
  *	@(#)ipc.h	8.4 (Berkeley) 2/19/95
  * $FreeBSD: src/sys/sys/ipc.h,v 1.15 1999/12/29 04:24:43 peter Exp $
- * $DragonFly: src/sys/sys/ipc.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/ipc.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 /*
@@ -85,7 +85,7 @@ struct ipc_perm {
 
 struct proc;
 
-int	ipcperm __P((struct proc *, struct ipc_perm *, int));
+int	ipcperm (struct proc *, struct ipc_perm *, int);
 #else /* ! _KERNEL */
 
 /* XXX doesn't really belong here, but has been historical practice in SysV. */
@@ -93,7 +93,7 @@ int	ipcperm __P((struct proc *, struct ipc_perm *, int));
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-key_t	ftok __P((const char *, int));
+key_t	ftok (const char *, int);
 __END_DECLS
 
 #endif /* _KERNEL */
diff --git a/sys/sys/jail.h b/sys/sys/jail.h
index 9e5f1038d3..1d1d84dd69 100644
--- a/sys/sys/jail.h
+++ b/sys/sys/jail.h
@@ -7,7 +7,7 @@
  * ----------------------------------------------------------------------------
  *
  * $FreeBSD: src/sys/sys/jail.h,v 1.8.2.2 2000/11/01 17:58:06 rwatson Exp $
- * $DragonFly: src/sys/sys/jail.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/jail.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  *
  */
 
@@ -23,7 +23,7 @@ struct jail {
 
 #ifndef _KERNEL
 
-int jail __P((struct jail *));
+int jail (struct jail *);
 
 #else /* _KERNEL */
 
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index a647b50320..71c6db313d 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -40,7 +40,7 @@
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/sys/kernel.h,v 1.63.2.9 2002/07/02 23:00:30 archie Exp $
- * $DragonFly: src/sys/sys/kernel.h,v 1.3 2003/07/31 12:01:37 hmp Exp $
+ * $DragonFly: src/sys/sys/kernel.h,v 1.4 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_KERNEL_H_
@@ -191,8 +191,8 @@ enum sysinit_elem_order {
  * modifiable or not.
  */
 
-typedef void (*sysinit_nfunc_t) __P((void *));
-typedef void (*sysinit_cfunc_t) __P((const void *));
+typedef void (*sysinit_nfunc_t) (void *);
+typedef void (*sysinit_cfunc_t) (const void *);
 
 struct sysinit {
 	unsigned int	subsystem;		/* subsystem identifier*/
@@ -242,7 +242,7 @@ struct sysinit {
 	C_SYSUNINIT(uniquifier, subsystem, order,		\
 	(sysinit_cfunc_t)(sysinit_nfunc_t)func, (void *)ident)
 
-void	sysinit_add __P((struct sysinit **set));
+void	sysinit_add (struct sysinit **set);
 
 /*
  * Infrastructure for tunable 'constants'.  Value may be specified at compile
@@ -355,11 +355,11 @@ extern struct linker_set execsw_set;
 
 struct intr_config_hook {
 	TAILQ_ENTRY(intr_config_hook) ich_links;
-	void	(*ich_func) __P((void *arg));
+	void	(*ich_func) (void *arg);
 	void	*ich_arg;
 };
 
-int	config_intrhook_establish __P((struct intr_config_hook *hook));
-void	config_intrhook_disestablish __P((struct intr_config_hook *hook));
+int	config_intrhook_establish (struct intr_config_hook *hook);
+void	config_intrhook_disestablish (struct intr_config_hook *hook);
 
 #endif /* !_SYS_KERNEL_H_*/
diff --git a/sys/sys/kthread.h b/sys/sys/kthread.h
index 1d43761b11..55b210b21d 100644
--- a/sys/sys/kthread.h
+++ b/sys/sys/kthread.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/kthread.h,v 1.2 2000/01/07 08:36:44 luoqi Exp $
- * $DragonFly: src/sys/sys/kthread.h,v 1.5 2003/06/27 03:30:43 dillon Exp $
+ * $DragonFly: src/sys/sys/kthread.h,v 1.6 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_KTHREAD_H_
@@ -40,19 +40,19 @@ struct thread;
  */
 struct kproc_desc {
 	char		*arg0;			/* arg 0 (for 'ps' listing) */
-	void		(*func) __P((void));	/* "main" for kernel process */
+	void		(*func) (void);		/* "main" for kernel process */
 	struct thread	**global_threadpp;	/* ptr to proc ptr save area */
 };
 
-void	kproc_start __P((const void *));
+void	kproc_start (const void *);
 
-int	suspend_kproc __P((struct thread *, int));
-int	resume_kproc __P((struct thread *));
-void	kproc_suspend_loop __P((void));
-void	shutdown_kproc __P((void *, int));
-int	kthread_create __P((void (*)(void *), void *, struct thread **,
-			const char *, ...));
-void	kthread_exit __P((void)) __dead2;
+int	suspend_kproc (struct thread *, int);
+int	resume_kproc (struct thread *);
+void	kproc_suspend_loop (void);
+void	shutdown_kproc (void *, int);
+int	kthread_create (void (*)(void *), void *, struct thread **,
+			const char *, ...);
+void	kthread_exit (void) __dead2;
 
 
 #endif
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index e363865ee6..c20411ec9b 100644
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
@@ -32,7 +32,7 @@
  *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/2/93
  * $FreeBSD: src/sys/sys/ktrace.h,v 1.19.2.3 2001/01/06 09:58:23 alfred Exp $
- * $DragonFly: src/sys/sys/ktrace.h,v 1.3 2003/06/25 03:56:10 dillon Exp $
+ * $DragonFly: src/sys/sys/ktrace.h,v 1.4 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_KTRACE_H_
@@ -159,20 +159,20 @@ struct ktr_csw {
 #define KTRFAC_ACTIVE	0x20000000	/* ktrace logging in progress, ignore */
 
 #ifdef	_KERNEL
-void	ktrnamei __P((struct vnode *,char *));
-void	ktrcsw __P((struct vnode *,int,int));
-void	ktrpsig __P((struct vnode *, int, sig_t, sigset_t *, int));
-void	ktrgenio __P((struct vnode *, int, enum uio_rw, struct uio *, int));
-void	ktrsyscall __P((struct vnode *, int, int narg, register_t args[]));
-void	ktrsysret __P((struct vnode *, int, int, register_t));
+void	ktrnamei (struct vnode *,char *);
+void	ktrcsw (struct vnode *,int,int);
+void	ktrpsig (struct vnode *, int, sig_t, sigset_t *, int);
+void	ktrgenio (struct vnode *, int, enum uio_rw, struct uio *, int);
+void	ktrsyscall (struct vnode *, int, int narg, register_t args[]);
+void	ktrsysret (struct vnode *, int, int, register_t);
 
 #else
 
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	ktrace __P((const char *, int, int, pid_t));
-int	utrace __P((const void *, size_t));
+int	ktrace (const char *, int, int, pid_t);
+int	utrace (const void *, size_t);
 __END_DECLS
 
 #endif
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index 7d66e274ee..9654f11577 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -32,7 +32,7 @@
  *
  *	@(#)libkern.h	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/sys/libkern.h,v 1.20.2.2 2001/09/30 21:12:54 luigi Exp $
- * $DragonFly: src/sys/sys/libkern.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/libkern.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_LIBKERN_H_
@@ -65,29 +65,29 @@ static __inline u_long ulmax(u_long a, u_long b) { return (a > b ? a : b); }
 static __inline u_long ulmin(u_long a, u_long b) { return (a < b ? a : b); }
 
 /* Prototypes for non-quad routines. */
-u_int32_t arc4random __P((void));
-int	 bcmp __P((const void *, const void *, size_t));
+u_int32_t arc4random (void);
+int	 bcmp (const void *, const void *, size_t);
 #ifndef HAVE_INLINE_FFS
-int	 ffs __P((int));
+int	 ffs (int);
 #endif
 #ifndef	HAVE_INLINE_FLS
-int	 fls __P((int));
+int	 fls (int);
 #endif
-int	 locc __P((int, char *, u_int));
-void	 qsort __P((void *base, size_t nmemb, size_t size,
-		    int (*compar)(const void *, const void *)));
-u_long	 random __P((void));
-char	*index __P((const char *, int));
-char	*rindex __P((const char *, int));
-int	 scanc __P((u_int, const u_char *, const u_char *, int));
-int	 skpc __P((int, int, char *));
-void	 srandom __P((u_long));
-char	*strcat __P((char *, const char *));
-int	 strcmp __P((const char *, const char *));
-char	*strcpy __P((char *, const char *));
-size_t	 strlen __P((const char *));
-int	 strncmp __P((const char *, const char *, size_t));
-char	*strncpy __P((char *, const char *, size_t));
+int	 locc (int, char *, u_int);
+void	 qsort (void *base, size_t nmemb, size_t size,
+		    int (*compar)(const void *, const void *));
+u_long	 random (void);
+char	*index (const char *, int);
+char	*rindex (const char *, int);
+int	 scanc (u_int, const u_char *, const u_char *, int);
+int	 skpc (int, int, char *);
+void	 srandom (u_long);
+char	*strcat (char *, const char *);
+int	 strcmp (const char *, const char *);
+char	*strcpy (char *, const char *);
+size_t	 strlen (const char *);
+int	 strncmp (const char *, const char *, size_t);
+char	*strncpy (char *, const char *, size_t);
 
 
 static __inline int
diff --git a/sys/sys/link_aout.h b/sys/sys/link_aout.h
index cb6f2701b6..b1136e3148 100644
--- a/sys/sys/link_aout.h
+++ b/sys/sys/link_aout.h
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/link_aout.h,v 1.20.2.1 2000/09/22 02:08:25 jdp Exp $
- * $DragonFly: src/sys/sys/link_aout.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/link_aout.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 /*
@@ -197,14 +197,14 @@ struct so_debug {
  * to crt0.
  */
 struct ld_entry {
-	void	*(*dlopen) __P((const char *, int));	/* NONE */
-	int	(*dlclose) __P((void *));		/* NONE */
-	void	*(*dlsym) __P((void *, const char *));	/* NONE */
-	const char *(*dlerror) __P((void));		/* NONE */
-	void	(*dlexit) __P((void));			/* HAS_DLEXIT */
-	void	*(*dlsym3) __P((void *, const char *, void *)); /* HAS_DLSYM3 */
-	int	 (*dladdr) __P((const void *,
-			        struct dl_info *));	/* HAS_DLADDR */
+	void	*(*dlopen) (const char *, int);	/* NONE */
+	int	(*dlclose) (void *);		/* NONE */
+	void	*(*dlsym) (void *, const char *);	/* NONE */
+	const char *(*dlerror) (void);		/* NONE */
+	void	(*dlexit) (void);			/* HAS_DLEXIT */
+	void	*(*dlsym3) (void *, const char *, void *); /* HAS_DLSYM3 */
+	int	 (*dladdr) (const void *,
+			        struct dl_info *);	/* HAS_DLADDR */
 };
 
 /*
diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h
index d03d152b56..8889a569a7 100644
--- a/sys/sys/link_elf.h
+++ b/sys/sys/link_elf.h
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/link_elf.h,v 1.20.2.2 2003/02/20 20:42:46 kan Exp $
- * $DragonFly: src/sys/sys/link_elf.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/link_elf.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 /*
@@ -208,14 +208,14 @@ struct so_debug {
  * to crt0.
  */
 struct ld_entry {
-	void	*(*dlopen) __P((const char *, int));	/* NONE */
-	int	(*dlclose) __P((void *));		/* NONE */
-	void	*(*dlsym) __P((void *, const char *));	/* NONE */
-	const char *(*dlerror) __P((void));		/* NONE */
-	void	(*dlexit) __P((void));			/* HAS_DLEXIT */
-	void	*(*dlsym3) __P((void *, const char *, void *)); /* HAS_DLSYM3 */
-	int	 (*dladdr) __P((const void *,
-			        struct dl_info *));	/* HAS_DLADDR */
+	void	*(*dlopen) (const char *, int);	/* NONE */
+	int	(*dlclose) (void *);		/* NONE */
+	void	*(*dlsym) (void *, const char *);	/* NONE */
+	const char *(*dlerror) (void);		/* NONE */
+	void	(*dlexit) (void);			/* HAS_DLEXIT */
+	void	*(*dlsym3) (void *, const char *, void *); /* HAS_DLSYM3 */
+	int	 (*dladdr) (const void *,
+			        struct dl_info *);	/* HAS_DLADDR */
 };
 
 /*
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index f742a25516..51237890be 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -36,7 +36,7 @@
  *
  *	@(#)lock.h	8.12 (Berkeley) 5/19/95
  * $FreeBSD: src/sys/sys/lock.h,v 1.17.2.3 2001/12/25 01:44:44 dillon Exp $
- * $DragonFly: src/sys/sys/lock.h,v 1.5 2003/07/19 21:14:50 dillon Exp $
+ * $DragonFly: src/sys/sys/lock.h,v 1.6 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef	_LOCK_H_
@@ -181,23 +181,23 @@ struct lock {
 void dumplockinfo(struct lock *lkp);
 struct proc;
 
-void	lockinit __P((struct lock *, int prio, char *wmesg, int timo,
-			int flags));
+void	lockinit (struct lock *, int prio, char *wmesg, int timo,
+			int flags);
 #ifdef DEBUG_LOCKS
-int	debuglockmgr __P((struct lock *, u_int flags,
+int	debuglockmgr (struct lock *, u_int flags,
 			struct lwkt_token *, struct thread *p,
 			const char *,
 			const char *,
-			int));
+			int);
 #define lockmgr(lockp, flags, slockp, td) \
 	debuglockmgr((lockp), (flags), (slockp), (td), \
 	    "lockmgr", __FILE__, __LINE__)
 #else
-int	lockmgr __P((struct lock *, u_int flags,
-			struct lwkt_token *, struct thread *td));
+int	lockmgr (struct lock *, u_int flags,
+			struct lwkt_token *, struct thread *td);
 #endif
-void	lockmgr_printinfo __P((struct lock *));
-int	lockstatus __P((struct lock *, struct thread *));
-int	lockcount __P((struct lock *));
+void	lockmgr_printinfo (struct lock *);
+int	lockstatus (struct lock *, struct thread *);
+int	lockcount (struct lock *);
 
 #endif /* !_LOCK_H_ */
diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h
index 62c60b9f71..217a61eb5b 100644
--- a/sys/sys/lockf.h
+++ b/sys/sys/lockf.h
@@ -35,7 +35,7 @@
  *
  *	@(#)lockf.h	8.1 (Berkeley) 6/11/93
  * $FreeBSD: src/sys/sys/lockf.h,v 1.10 1999/08/28 00:51:51 peter Exp $
- * $DragonFly: src/sys/sys/lockf.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/lockf.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_LOCKF_H_
@@ -69,11 +69,11 @@ struct lockf {
 /* Maximum length of sleep chains to traverse to try and detect deadlock. */
 #define MAXDEPTH 50
 
-int	 lf_advlock __P((struct vop_advlock_args *, struct lockf **, u_quad_t));
+int	 lf_advlock (struct vop_advlock_args *, struct lockf **, u_quad_t);
 
 #ifdef LOCKF_DEBUG
-void	lf_print __P((char *, struct lockf *));
-void	lf_printlist __P((char *, struct lockf *));
+void	lf_print (char *, struct lockf *);
+void	lf_printlist (char *, struct lockf *);
 #endif
 
 #endif /* !_SYS_LOCKF_H_ */
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index a09a5795ae..5e9e1c5d2a 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -32,7 +32,7 @@
  *
  *	@(#)malloc.h	8.5 (Berkeley) 5/3/95
  * $FreeBSD: src/sys/sys/malloc.h,v 1.48.2.2 2002/03/16 02:19:16 archie Exp $
- * $DragonFly: src/sys/sys/malloc.h,v 1.4 2003/07/28 05:03:25 hmp Exp $
+ * $DragonFly: src/sys/sys/malloc.h,v 1.5 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_MALLOC_H_
@@ -167,19 +167,19 @@ struct kmembuckets {
 MALLOC_DECLARE(M_IOV);
 
 /* XXX struct malloc_type is unused for contig*(). */
-void	contigfree __P((void *addr, unsigned long size,
-			struct malloc_type *type));
-void	*contigmalloc __P((unsigned long size, struct malloc_type *type,
+void	contigfree (void *addr, unsigned long size,
+			struct malloc_type *type);
+void	*contigmalloc (unsigned long size, struct malloc_type *type,
 			   int flags, unsigned long low, unsigned long high,
-			   unsigned long alignment, unsigned long boundary));
-void	free __P((void *addr, struct malloc_type *type));
-void	*malloc __P((unsigned long size, struct malloc_type *type, int flags));
-void	malloc_init __P((void *));
-void	malloc_uninit __P((void *));
-void	*realloc __P((void *addr, unsigned long size,
-		      struct malloc_type *type, int flags));
-void	*reallocf __P((void *addr, unsigned long size,
-		      struct malloc_type *type, int flags));
+			   unsigned long alignment, unsigned long boundary);
+void	free (void *addr, struct malloc_type *type);
+void	*malloc (unsigned long size, struct malloc_type *type, int flags);
+void	malloc_init (void *);
+void	malloc_uninit (void *);
+void	*realloc (void *addr, unsigned long size,
+		      struct malloc_type *type, int flags);
+void	*reallocf (void *addr, unsigned long size,
+		      struct malloc_type *type, int flags);
 #endif /* _KERNEL */
 
 #endif /* !_SYS_MALLOC_H_ */
diff --git a/sys/sys/md5.h b/sys/sys/md5.h
index 8663c1ca34..36646b7b3f 100644
--- a/sys/sys/md5.h
+++ b/sys/sys/md5.h
@@ -1,6 +1,6 @@
 /* MD5.H - header file for MD5C.C
  * $FreeBSD: src/sys/sys/md5.h,v 1.13 1999/12/29 04:24:44 peter Exp $
- * $DragonFly: src/sys/sys/md5.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/md5.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
@@ -45,7 +45,7 @@ char * MD5End(MD5_CTX *, char *);
 char * MD5File(const char *, char *);
 char * MD5Data(const unsigned char *, unsigned int, char *);
 #ifdef _KERNEL
-void MD5Transform __P((u_int32_t [4], const unsigned char [64]));
+void MD5Transform (u_int32_t [4], const unsigned char [64]);
 #endif
 __END_DECLS
 #endif /* _SYS_MD5_H_ */
diff --git a/sys/sys/mman.h b/sys/sys/mman.h
index 18c18e6c41..b92447e4ac 100644
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -32,7 +32,7 @@
  *
  *	@(#)mman.h	8.2 (Berkeley) 1/9/95
  * $FreeBSD: src/sys/sys/mman.h,v 1.29.2.1 2001/08/25 07:25:43 dillon Exp $
- * $DragonFly: src/sys/sys/mman.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/mman.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_MMAN_H_
@@ -137,24 +137,24 @@
 
 __BEGIN_DECLS
 #ifdef _P1003_1B_VISIBLE
-int	mlockall __P((int));
-int	munlockall __P((void));
-int	shm_open __P((const char *, int, mode_t));
-int	shm_unlink __P((const char *));
+int	mlockall (int);
+int	munlockall (void);
+int	shm_open (const char *, int, mode_t);
+int	shm_unlink (const char *);
 #endif /* _P1003_1B_VISIBLE */
-int	mlock __P((const void *, size_t));
+int	mlock (const void *, size_t);
 #ifndef _MMAP_DECLARED
 #define	_MMAP_DECLARED
-void *	mmap __P((void *, size_t, int, int, int, off_t));
+void *	mmap (void *, size_t, int, int, int, off_t);
 #endif
-int	mprotect __P((const void *, size_t, int));
-int	msync __P((void *, size_t, int));
-int	munlock __P((const void *, size_t));
-int	munmap __P((void *, size_t));
+int	mprotect (const void *, size_t, int);
+int	msync (void *, size_t, int);
+int	munlock (const void *, size_t);
+int	munmap (void *, size_t);
 #ifndef _POSIX_SOURCE
-int	madvise __P((void *, size_t, int));
-int	mincore __P((const void *, size_t, char *));
-int	minherit __P((void *, size_t, int));
+int	madvise (void *, size_t, int);
+int	mincore (const void *, size_t, char *);
+int	minherit (void *, size_t, int);
 #endif
 __END_DECLS
 
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 52a6f08c7a..fc18e8180b 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -32,7 +32,7 @@
  *
  *	@(#)mount.h	8.21 (Berkeley) 5/20/95
  * $FreeBSD: src/sys/sys/mount.h,v 1.89.2.7 2003/04/04 20:35:57 tegge Exp $
- * $DragonFly: src/sys/sys/mount.h,v 1.5 2003/07/06 21:23:54 dillon Exp $
+ * $DragonFly: src/sys/sys/mount.h,v 1.6 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_MOUNT_H_
@@ -329,31 +329,31 @@ struct mbuf;
 #endif
 
 struct vfsops {
-	int	(*vfs_mount)	__P((struct mount *mp, char *path, caddr_t data,
-				    struct nameidata *ndp, struct thread *td));
-	int	(*vfs_start)	__P((struct mount *mp, int flags,
-				    struct thread *td));
-	int	(*vfs_unmount)	__P((struct mount *mp, int mntflags,
-				    struct thread *td));
-	int	(*vfs_root)	__P((struct mount *mp, struct vnode **vpp));
-	int	(*vfs_quotactl)	__P((struct mount *mp, int cmds, uid_t uid,
-				    caddr_t arg, struct thread *td));
-	int	(*vfs_statfs)	__P((struct mount *mp, struct statfs *sbp,
-				    struct thread *td));
-	int	(*vfs_sync)	__P((struct mount *mp, int waitfor,
-				    struct thread *td));
-	int	(*vfs_vget)	__P((struct mount *mp, ino_t ino,
-				    struct vnode **vpp));
-	int	(*vfs_fhtovp)	__P((struct mount *mp, struct fid *fhp,
-				    struct vnode **vpp));
-	int	(*vfs_checkexp) __P((struct mount *mp, struct sockaddr *nam,
-				    int *extflagsp, struct ucred **credanonp));
-	int	(*vfs_vptofh)	__P((struct vnode *vp, struct fid *fhp));
-	int	(*vfs_init)	__P((struct vfsconf *));
-	int	(*vfs_uninit)	__P((struct vfsconf *));
-	int	(*vfs_extattrctl) __P((struct mount *mp, int cmd,
+	int	(*vfs_mount)	(struct mount *mp, char *path, caddr_t data,
+				    struct nameidata *ndp, struct thread *td);
+	int	(*vfs_start)	(struct mount *mp, int flags,
+				    struct thread *td);
+	int	(*vfs_unmount)	(struct mount *mp, int mntflags,
+				    struct thread *td);
+	int	(*vfs_root)	(struct mount *mp, struct vnode **vpp);
+	int	(*vfs_quotactl)	(struct mount *mp, int cmds, uid_t uid,
+				    caddr_t arg, struct thread *td);
+	int	(*vfs_statfs)	(struct mount *mp, struct statfs *sbp,
+				    struct thread *td);
+	int	(*vfs_sync)	(struct mount *mp, int waitfor,
+				    struct thread *td);
+	int	(*vfs_vget)	(struct mount *mp, ino_t ino,
+				    struct vnode **vpp);
+	int	(*vfs_fhtovp)	(struct mount *mp, struct fid *fhp,
+				    struct vnode **vpp);
+	int	(*vfs_checkexp) (struct mount *mp, struct sockaddr *nam,
+				    int *extflagsp, struct ucred **credanonp);
+	int	(*vfs_vptofh)	(struct vnode *vp, struct fid *fhp);
+	int	(*vfs_init)	(struct vfsconf *);
+	int	(*vfs_uninit)	(struct vfsconf *);
+	int	(*vfs_extattrctl) (struct mount *mp, int cmd,
 					const char *attrname, caddr_t arg,
-					struct thread *td));
+					struct thread *td);
 };
 
 #define VFS_MOUNT(MP, PATH, DATA, NDP, P) \
@@ -416,28 +416,28 @@ extern	char *mountrootfsname;
 /*
  * exported vnode operations
  */
-int	dounmount __P((struct mount *, int, struct thread *));
+int	dounmount (struct mount *, int, struct thread *);
 int	vfs_setpublicfs			    /* set publicly exported fs */
-	  __P((struct mount *, struct netexport *, struct export_args *));
-int	vfs_lock __P((struct mount *));         /* lock a vfs */
-void	vfs_msync __P((struct mount *, int));
-void	vfs_unlock __P((struct mount *));       /* unlock a vfs */
-int	vfs_busy __P((struct mount *, int, struct lwkt_token *, struct thread *));
+	  (struct mount *, struct netexport *, struct export_args *);
+int	vfs_lock (struct mount *);         /* lock a vfs */
+void	vfs_msync (struct mount *, int);
+void	vfs_unlock (struct mount *);       /* unlock a vfs */
+int	vfs_busy (struct mount *, int, struct lwkt_token *, struct thread *);
 int	vfs_export			    /* process mount export info */
-	  __P((struct mount *, struct netexport *, struct export_args *));
+	  (struct mount *, struct netexport *, struct export_args *);
 struct	netcred *vfs_export_lookup	    /* lookup host in fs export list */
-	  __P((struct mount *, struct netexport *, struct sockaddr *));
-int	vfs_allocate_syncvnode __P((struct mount *));
-void	vfs_getnewfsid __P((struct mount *));
-dev_t	vfs_getrootfsid __P((struct mount *));
-struct	mount *vfs_getvfs __P((fsid_t *));      /* return vfs given fsid */
-int	vfs_modevent __P((module_t, int, void *));
-int	vfs_mountedon __P((struct vnode *));    /* is a vfs mounted on vp */
-int	vfs_rootmountalloc __P((char *, char *, struct mount **));
-void	vfs_unbusy __P((struct mount *, struct thread *));
-void	vfs_unmountall __P((void));
-int	vfs_register __P((struct vfsconf *));
-int	vfs_unregister __P((struct vfsconf *));
+	  (struct mount *, struct netexport *, struct sockaddr *);
+int	vfs_allocate_syncvnode (struct mount *);
+void	vfs_getnewfsid (struct mount *);
+dev_t	vfs_getrootfsid (struct mount *);
+struct	mount *vfs_getvfs (fsid_t *);      /* return vfs given fsid */
+int	vfs_modevent (module_t, int, void *);
+int	vfs_mountedon (struct vnode *);    /* is a vfs mounted on vp */
+int	vfs_rootmountalloc (char *, char *, struct mount **);
+void	vfs_unbusy (struct mount *, struct thread *);
+void	vfs_unmountall (void);
+int	vfs_register (struct vfsconf *);
+int	vfs_unregister (struct vfsconf *);
 extern	TAILQ_HEAD(mntlist, mount) mountlist;	/* mounted filesystem list */
 extern	struct lwkt_token mountlist_token;
 extern	struct nfs_public nfs_pub;
@@ -447,51 +447,51 @@ extern	struct nfs_public nfs_pub;
  * kern/vfs_default.c, they should be used instead of making "dummy" 
  * functions or casting entries in the VFS op table to "enopnotsupp()".
  */ 
-int	vfs_stdmount __P((struct mount *mp, char *path, caddr_t data, 
-		struct nameidata *ndp, struct thread *p));
-int	vfs_stdstart __P((struct mount *mp, int flags, struct thread *p));
-int	vfs_stdunmount __P((struct mount *mp, int mntflags, struct thread *p));
-int	vfs_stdroot __P((struct mount *mp, struct vnode **vpp));
-int	vfs_stdquotactl __P((struct mount *mp, int cmds, uid_t uid,
-		caddr_t arg, struct thread *p));
-int	vfs_stdstatfs __P((struct mount *mp, struct statfs *sbp, struct thread *p));
-int	vfs_stdsync __P((struct mount *mp, int waitfor, struct thread *td));
-int	vfs_stdvget __P((struct mount *mp, ino_t ino, struct vnode **vpp));
-int	vfs_stdfhtovp __P((struct mount *mp, struct fid *fhp, struct vnode **vpp));
-int	vfs_stdcheckexp __P((struct mount *mp, struct sockaddr *nam,
-	   int *extflagsp, struct ucred **credanonp));
-int	vfs_stdvptofh __P((struct vnode *vp, struct fid *fhp));
-int	vfs_stdinit __P((struct vfsconf *));
-int	vfs_stduninit __P((struct vfsconf *));
-int	vfs_stdextattrctl __P((struct mount *mp, int cmd, const char *attrname,
-		caddr_t arg, struct thread *p));
+int	vfs_stdmount (struct mount *mp, char *path, caddr_t data, 
+		struct nameidata *ndp, struct thread *p);
+int	vfs_stdstart (struct mount *mp, int flags, struct thread *p);
+int	vfs_stdunmount (struct mount *mp, int mntflags, struct thread *p);
+int	vfs_stdroot (struct mount *mp, struct vnode **vpp);
+int	vfs_stdquotactl (struct mount *mp, int cmds, uid_t uid,
+		caddr_t arg, struct thread *p);
+int	vfs_stdstatfs (struct mount *mp, struct statfs *sbp, struct thread *p);
+int	vfs_stdsync (struct mount *mp, int waitfor, struct thread *td);
+int	vfs_stdvget (struct mount *mp, ino_t ino, struct vnode **vpp);
+int	vfs_stdfhtovp (struct mount *mp, struct fid *fhp, struct vnode **vpp);
+int	vfs_stdcheckexp (struct mount *mp, struct sockaddr *nam,
+	   int *extflagsp, struct ucred **credanonp);
+int	vfs_stdvptofh (struct vnode *vp, struct fid *fhp);
+int	vfs_stdinit (struct vfsconf *);
+int	vfs_stduninit (struct vfsconf *);
+int	vfs_stdextattrctl (struct mount *mp, int cmd, const char *attrname,
+		caddr_t arg, struct thread *p);
 
 #else /* !_KERNEL */
 
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	fstatfs __P((int, struct statfs *));
-int	getfh __P((const char *, fhandle_t *));
-int	getfsstat __P((struct statfs *, long, int));
-int	getmntinfo __P((struct statfs **, int));
-int	mount __P((const char *, const char *, int, void *));
-int	statfs __P((const char *, struct statfs *));
-int	unmount __P((const char *, int));
-int	fhopen __P((const struct fhandle *, int));
-int	fhstat __P((const struct fhandle *, struct stat *));
-int	fhstatfs __P((const struct fhandle *, struct statfs *));
+int	fstatfs (int, struct statfs *);
+int	getfh (const char *, fhandle_t *);
+int	getfsstat (struct statfs *, long, int);
+int	getmntinfo (struct statfs **, int);
+int	mount (const char *, const char *, int, void *);
+int	statfs (const char *, struct statfs *);
+int	unmount (const char *, int);
+int	fhopen (const struct fhandle *, int);
+int	fhstat (const struct fhandle *, struct stat *);
+int	fhstatfs (const struct fhandle *, struct statfs *);
 
 /* C library stuff */
-void	endvfsent __P((void));
-struct	ovfsconf *getvfsbyname __P((const char *));
-struct	ovfsconf *getvfsbytype __P((int));
-struct	ovfsconf *getvfsent __P((void));
+void	endvfsent (void);
+struct	ovfsconf *getvfsbyname (const char *);
+struct	ovfsconf *getvfsbytype (int);
+struct	ovfsconf *getvfsent (void);
 #define	getvfsbyname	new_getvfsbyname
-int	new_getvfsbyname __P((const char *, struct vfsconf *));
-void	setvfsent __P((int));
-int	vfsisloadable __P((const char *));
-int	vfsload __P((const char *));
+int	new_getvfsbyname (const char *, struct vfsconf *);
+void	setvfsent (int);
+int	vfsisloadable (const char *);
+int	vfsload (const char *);
 __END_DECLS
 
 #endif /* _KERNEL */
diff --git a/sys/sys/msg.h b/sys/sys/msg.h
index 2116882bbd..84d30f4308 100644
--- a/sys/sys/msg.h
+++ b/sys/sys/msg.h
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/sys/msg.h,v 1.10.2.1 2000/08/04 22:31:10 peter Exp $ */
-/* $DragonFly: src/sys/sys/msg.h,v 1.2 2003/06/17 04:28:58 dillon Exp $ */
+/* $DragonFly: src/sys/sys/msg.h,v 1.3 2003/08/20 07:31:21 rob Exp $ */
 /*	$NetBSD: msg.h,v 1.4 1994/06/29 06:44:43 cgd Exp $	*/
 
 /*
@@ -96,11 +96,11 @@ extern struct msginfo	msginfo;
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int msgsys __P((int, ...));
-int msgctl __P((int, int, struct msqid_ds *));
-int msgget __P((key_t, int));
-int msgsnd __P((int, void *, size_t, int));
-int msgrcv __P((int, void*, size_t, long, int));
+int msgsys (int, ...);
+int msgctl (int, int, struct msqid_ds *);
+int msgget (key_t, int);
+int msgsnd (int, void *, size_t, int);
+int msgrcv (int, void*, size_t, long, int);
 __END_DECLS
 #endif
 
diff --git a/sys/sys/msgbuf.h b/sys/sys/msgbuf.h
index 92715581e5..c04f867521 100644
--- a/sys/sys/msgbuf.h
+++ b/sys/sys/msgbuf.h
@@ -32,7 +32,7 @@
  *
  *	@(#)msgbuf.h	8.1 (Berkeley) 6/2/93
  * $FreeBSD: src/sys/sys/msgbuf.h,v 1.14.2.1 2001/01/16 12:26:21 phk Exp $
- * $DragonFly: src/sys/sys/msgbuf.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/msgbuf.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_MSGBUF_H_
@@ -51,7 +51,7 @@ struct	msgbuf {
 extern int	msgbufmapped;
 extern int	msgbuftrigger;
 extern struct	msgbuf *msgbufp;
-void	msgbufinit	__P((void *ptr, size_t size));
+void	msgbufinit	(void *ptr, size_t size);
 
 #if !defined(MSGBUF_SIZE)
 #define	MSGBUF_SIZE	32768
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index a2c2ed3f97..14638b84e7 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -32,7 +32,7 @@
  *
  *	@(#)namei.h	8.5 (Berkeley) 1/9/95
  * $FreeBSD: src/sys/sys/namei.h,v 1.29.2.2 2001/09/30 21:12:54 luigi Exp $
- * $DragonFly: src/sys/sys/namei.h,v 1.4 2003/07/13 05:45:12 dillon Exp $
+ * $DragonFly: src/sys/sys/namei.h,v 1.5 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_NAMEI_H_
@@ -157,8 +157,8 @@ struct nameidata {
 /*
  * Initialization of an nameidata structure.
  */
-static void NDINIT __P((struct nameidata *, u_long, u_long, enum uio_seg,
-	    const char *, struct thread *));
+static void NDINIT (struct nameidata *, u_long, u_long, enum uio_seg,
+	    const char *, struct thread *);
 static __inline void
 NDINIT(struct nameidata *ndp,
 	u_long op, u_long flags,
@@ -187,12 +187,12 @@ NDINIT(struct nameidata *ndp,
 #define NDF_NO_FREE_PNBUF	0x00000020
 #define NDF_ONLY_PNBUF		(~NDF_NO_FREE_PNBUF)
 
-void NDFREE __P((struct nameidata *, const uint));
+void NDFREE (struct nameidata *, const uint);
 
-int	namei __P((struct nameidata *ndp));
-int	lookup __P((struct nameidata *ndp));
-int	relookup __P((struct vnode *dvp, struct vnode **vpp,
-	    struct componentname *cnp));
+int	namei (struct nameidata *ndp);
+int	lookup (struct nameidata *ndp);
+int	relookup (struct vnode *dvp, struct vnode **vpp,
+	    struct componentname *cnp);
 #endif
 
 /*
diff --git a/sys/sys/nlist_aout.h b/sys/sys/nlist_aout.h
index 597d60dd9c..a1423c1147 100644
--- a/sys/sys/nlist_aout.h
+++ b/sys/sys/nlist_aout.h
@@ -38,7 +38,7 @@
  *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
  *
  * $FreeBSD: src/sys/sys/nlist_aout.h,v 1.7 1999/08/27 23:44:51 peter Exp $
- * $DragonFly: src/sys/sys/nlist_aout.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/nlist_aout.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _NLIST_H_
@@ -116,7 +116,7 @@ struct nlist {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int nlist __P((const char *, struct nlist *));
+int nlist (const char *, struct nlist *);
 __END_DECLS
 
 #endif /* !_NLIST_H_ */
diff --git a/sys/sys/odisklabel.h b/sys/sys/odisklabel.h
index 8010005687..3802fd0108 100644
--- a/sys/sys/odisklabel.h
+++ b/sys/sys/odisklabel.h
@@ -32,7 +32,7 @@
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
  * $FreeBSD: src/sys/sys/disklabel.h,v 1.49.2.7 2001/05/27 05:58:26 jkh Exp $
- * $DragonFly: src/sys/sys/Attic/odisklabel.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/Attic/odisklabel.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_DISKLABEL_H_
@@ -463,18 +463,18 @@ dkunit(dev_t dev)
 struct	buf;
 struct	buf_queue_head;
 
-int	bounds_check_with_label __P((struct buf *bp, struct disklabel *lp,
-				     int wlabel));
-void	diskerr __P((struct buf *bp, char *what, int pri, int blkdone,
-		     struct disklabel *lp));
-void	disksort __P((struct buf *ap, struct buf *bp));
-char	*readdisklabel __P((dev_t dev, struct disklabel *lp));
-void	bufqdisksort __P((struct buf_queue_head *ap, struct buf *bp));
-int	setdisklabel __P((struct disklabel *olp, struct disklabel *nlp,
-			  u_long openmask));
-int	writedisklabel __P((dev_t dev, struct disklabel *lp));
+int	bounds_check_with_label (struct buf *bp, struct disklabel *lp,
+				     int wlabel);
+void	diskerr (struct buf *bp, char *what, int pri, int blkdone,
+		     struct disklabel *lp);
+void	disksort (struct buf *ap, struct buf *bp);
+char	*readdisklabel (dev_t dev, struct disklabel *lp);
+void	bufqdisksort (struct buf_queue_head *ap, struct buf *bp);
+int	setdisklabel (struct disklabel *olp, struct disklabel *nlp,
+			  u_long openmask);
+int	writedisklabel (dev_t dev, struct disklabel *lp);
 #ifdef __alpha__
-void	alpha_fix_srm_checksum __P((struct buf *bp));
+void	alpha_fix_srm_checksum (struct buf *bp);
 #endif
 
 #endif /* _KERNEL */
@@ -483,7 +483,7 @@ void	alpha_fix_srm_checksum __P((struct buf *bp));
 
 #ifndef _KERNEL
 __BEGIN_DECLS
-struct disklabel *getdiskbyname __P((const char *));
+struct disklabel *getdiskbyname (const char *);
 __END_DECLS
 #endif
 
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 3dce124cc1..492ca8a93f 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -37,7 +37,7 @@
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
  * $FreeBSD: src/sys/sys/param.h,v 1.61.2.38 2003/05/22 17:12:01 fjoe Exp $
- * $DragonFly: src/sys/sys/param.h,v 1.5 2003/08/01 17:46:23 dillon Exp $
+ * $DragonFly: src/sys/sys/param.h,v 1.6 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_PARAM_H_
@@ -250,7 +250,7 @@
  * things that included sys/systm.h just for panic().
  */
 #ifdef _KERNEL
-void	panic __P((const char *, ...)) __dead2 __printflike(1, 2);
+void	panic (const char *, ...) __dead2 __printflike(1, 2);
 #endif
 
 #endif	/* _SYS_PARAM_H_ */
diff --git a/sys/sys/poll.h b/sys/sys/poll.h
index c295dfce4b..824539b461 100644
--- a/sys/sys/poll.h
+++ b/sys/sys/poll.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/poll.h,v 1.6.2.1 2000/08/21 12:25:58 sheldonh Exp $
- * $DragonFly: src/sys/sys/poll.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/poll.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_POLL_H_
@@ -101,7 +101,7 @@ __BEGIN_DECLS
  * XXX poll() has "unsigned long" nfds on SVR4, not unsigned as on the
  * other BSDs.
  */
-int	poll __P((struct pollfd *_pfd, unsigned int _nfds, int _timeout));
+int	poll (struct pollfd *_pfd, unsigned int _nfds, int _timeout);
 __END_DECLS
 
 #endif /* !_KERNEL */
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 162fdebadc..4b60bfab92 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -37,7 +37,7 @@
  *
  *	@(#)proc.h	8.15 (Berkeley) 5/19/95
  * $FreeBSD: src/sys/sys/proc.h,v 1.99.2.9 2003/06/06 20:21:32 tegge Exp $
- * $DragonFly: src/sys/sys/proc.h,v 1.28 2003/07/26 20:58:09 hmp Exp $
+ * $DragonFly: src/sys/sys/proc.h,v 1.29 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_PROC_H_
@@ -388,57 +388,57 @@ extern int	whichidqs;	/* Bit mask summary of non-empty Q's. */
 extern	u_long ps_arg_cache_limit;
 extern	int ps_argsopen;
 
-struct proc *pfind __P((pid_t));	/* Find process by id. */
-struct pgrp *pgfind __P((pid_t));	/* Find process group by id. */
-struct proc *zpfind __P((pid_t));	/* Find zombie process by id. */
+struct proc *pfind (pid_t);	/* Find process by id. */
+struct pgrp *pgfind (pid_t);	/* Find process group by id. */
+struct proc *zpfind (pid_t);	/* Find zombie process by id. */
 
 struct vm_zone;
 struct globaldata;
 extern struct vm_zone *proc_zone;
 
-int	enterpgrp __P((struct proc *p, pid_t pgid, int mksess));
-void	fixjobc __P((struct proc *p, struct pgrp *pgrp, int entering));
-int	inferior __P((struct proc *p));
-int	leavepgrp __P((struct proc *p));
-void	mi_switch __P((void));
-void	procinit __P((void));
+int	enterpgrp (struct proc *p, pid_t pgid, int mksess);
+void	fixjobc (struct proc *p, struct pgrp *pgrp, int entering);
+int	inferior (struct proc *p);
+int	leavepgrp (struct proc *p);
+void	mi_switch (void);
+void	procinit (void);
 void	relscurproc(struct proc *curp);
-int	p_trespass __P((struct ucred *cr1, struct ucred *cr2));
-void	resetpriority __P((struct proc *));
-int	roundrobin_interval __P((void));
+int	p_trespass (struct ucred *cr1, struct ucred *cr2);
+void	resetpriority (struct proc *);
+int	roundrobin_interval (void);
 void	resched_cpus(u_int32_t mask);
-void	schedclock __P((struct proc *));
-void	setrunnable __P((struct proc *));
-void	clrrunnable __P((struct proc *, int stat));
-void	setrunqueue __P((struct proc *));
-void	sleepinit __P((void));
-int	suser __P((struct thread *td));
-int	suser_proc __P((struct proc *p));
-int	suser_cred __P((struct ucred *cred, int flag));
-void	remrunqueue __P((struct proc *));
-void	release_curproc __P((struct proc *curp));
-void	acquire_curproc __P((struct proc *curp));
-void	cpu_heavy_switch __P((struct thread *));
-void	cpu_lwkt_switch __P((struct thread *));
-void	unsleep __P((struct thread *));
-
-void	cpu_proc_exit __P((void)) __dead2;
-void	cpu_thread_exit __P((void)) __dead2;
-void	exit1 __P((int)) __dead2;
-void	cpu_fork __P((struct proc *, struct proc *, int));
-void	cpu_set_fork_handler __P((struct proc *, void (*)(void *), void *));
+void	schedclock (struct proc *);
+void	setrunnable (struct proc *);
+void	clrrunnable (struct proc *, int stat);
+void	setrunqueue (struct proc *);
+void	sleepinit (void);
+int	suser (struct thread *td);
+int	suser_proc (struct proc *p);
+int	suser_cred (struct ucred *cred, int flag);
+void	remrunqueue (struct proc *);
+void	release_curproc (struct proc *curp);
+void	acquire_curproc (struct proc *curp);
+void	cpu_heavy_switch (struct thread *);
+void	cpu_lwkt_switch (struct thread *);
+void	unsleep (struct thread *);
+
+void	cpu_proc_exit (void) __dead2;
+void	cpu_thread_exit (void) __dead2;
+void	exit1 (int) __dead2;
+void	cpu_fork (struct proc *, struct proc *, int);
+void	cpu_set_fork_handler (struct proc *, void (*)(void *), void *);
 void	cpu_set_thread_handler(struct thread *td, void (*retfunc)(void), void *func, void *arg);
-int	fork1 __P((struct proc *, int, struct proc **));
-void	start_forked_proc __P((struct proc *, struct proc *));
-int	trace_req __P((struct proc *));
-void	cpu_proc_wait __P((struct proc *));
-void	cpu_thread_wait __P((struct thread *));
-int	cpu_coredump __P((struct thread *, struct vnode *, struct ucred *));
-void	setsugid __P((void));
-void	faultin __P((struct proc *p));
+int	fork1 (struct proc *, int, struct proc **);
+void	start_forked_proc (struct proc *, struct proc *);
+int	trace_req (struct proc *);
+void	cpu_proc_wait (struct proc *);
+void	cpu_thread_wait (struct thread *);
+int	cpu_coredump (struct thread *, struct vnode *, struct ucred *);
+void	setsugid (void);
+void	faultin (struct proc *p);
 void	sched_thread_init(void);
 
-u_int32_t	procrunnable __P((void));
+u_int32_t	procrunnable (void);
 
 #endif	/* _KERNEL */
 
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
index 16ba2b095c..82f6b46972 100644
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -32,7 +32,7 @@
  *
  *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
  * $FreeBSD: src/sys/sys/protosw.h,v 1.28.2.2 2001/07/03 11:02:01 ume Exp $
- * $DragonFly: src/sys/sys/protosw.h,v 1.3 2003/06/25 03:56:10 dillon Exp $
+ * $DragonFly: src/sys/sys/protosw.h,v 1.4 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_PROTOSW_H_
@@ -74,23 +74,23 @@ struct protosw {
 	short	pr_protocol;		/* protocol number */
 	short	pr_flags;		/* see below */
 /* protocol-protocol hooks */
-	void	(*pr_input) __P((struct mbuf *, int len));
+	void	(*pr_input) (struct mbuf *, int len);
 					/* input to protocol (from below) */
-	int	(*pr_output)	__P((struct mbuf *m, struct socket *so));
+	int	(*pr_output)	(struct mbuf *m, struct socket *so);
 					/* output to protocol (from above) */
-	void	(*pr_ctlinput)__P((int, struct sockaddr *, void *));
+	void	(*pr_ctlinput)(int, struct sockaddr *, void *);
 					/* control input (from below) */
-	int	(*pr_ctloutput)__P((struct socket *, struct sockopt *));
+	int	(*pr_ctloutput)(struct socket *, struct sockopt *);
 					/* control output (from above) */
 /* user-protocol hook */
 	void	*pr_ousrreq;
 /* utility hooks */
-	void	(*pr_init) __P((void));	/* initialization hook */
-	void	(*pr_fasttimo) __P((void));
+	void	(*pr_init) (void);	/* initialization hook */
+	void	(*pr_fasttimo) (void);
 					/* fast timeout (200ms) */
-	void	(*pr_slowtimo) __P((void));
+	void	(*pr_slowtimo) (void);
 					/* slow timeout (500ms) */
-	void	(*pr_drain) __P((void));
+	void	(*pr_drain) (void);
 					/* flush any excess space possible */
 	struct	pr_usrreqs *pr_usrreqs;	/* supersedes pr_usrreq() */
 };
@@ -181,35 +181,35 @@ struct uio;
  * migrate this stuff back into the main structure.
  */
 struct pr_usrreqs {
-	int	(*pru_abort) __P((struct socket *so));
-	int	(*pru_accept) __P((struct socket *so, struct sockaddr **nam));
-	int	(*pru_attach) __P((struct socket *so, int proto,
-				   struct thread *td));
-	int	(*pru_bind) __P((struct socket *so, struct sockaddr *nam,
-				 struct thread *td));
-	int	(*pru_connect) __P((struct socket *so, struct sockaddr *nam,
-				    struct thread *td));
-	int	(*pru_connect2) __P((struct socket *so1, struct socket *so2));
-	int	(*pru_control) __P((struct socket *so, u_long cmd, caddr_t data,
-				    struct ifnet *ifp, struct thread *td));
-	int	(*pru_detach) __P((struct socket *so));
-	int	(*pru_disconnect) __P((struct socket *so));
-	int	(*pru_listen) __P((struct socket *so, struct thread *td));
-	int	(*pru_peeraddr) __P((struct socket *so, 
-				     struct sockaddr **nam));
-	int	(*pru_rcvd) __P((struct socket *so, int flags));
-	int	(*pru_rcvoob) __P((struct socket *so, struct mbuf *m,
-				   int flags));
-	int	(*pru_send) __P((struct socket *so, int flags, struct mbuf *m, 
+	int	(*pru_abort) (struct socket *so);
+	int	(*pru_accept) (struct socket *so, struct sockaddr **nam);
+	int	(*pru_attach) (struct socket *so, int proto,
+				   struct thread *td);
+	int	(*pru_bind) (struct socket *so, struct sockaddr *nam,
+				 struct thread *td);
+	int	(*pru_connect) (struct socket *so, struct sockaddr *nam,
+				    struct thread *td);
+	int	(*pru_connect2) (struct socket *so1, struct socket *so2);
+	int	(*pru_control) (struct socket *so, u_long cmd, caddr_t data,
+				    struct ifnet *ifp, struct thread *td);
+	int	(*pru_detach) (struct socket *so);
+	int	(*pru_disconnect) (struct socket *so);
+	int	(*pru_listen) (struct socket *so, struct thread *td);
+	int	(*pru_peeraddr) (struct socket *so, 
+				     struct sockaddr **nam);
+	int	(*pru_rcvd) (struct socket *so, int flags);
+	int	(*pru_rcvoob) (struct socket *so, struct mbuf *m,
+				   int flags);
+	int	(*pru_send) (struct socket *so, int flags, struct mbuf *m, 
 				 struct sockaddr *addr, struct mbuf *control,
-				 struct thread *td));
+				 struct thread *td);
 #define	PRUS_OOB	0x1
 #define	PRUS_EOF	0x2
 #define	PRUS_MORETOCOME	0x4
-	int	(*pru_sense) __P((struct socket *so, struct stat *sb));
-	int	(*pru_shutdown) __P((struct socket *so));
-	int	(*pru_sockaddr) __P((struct socket *so, 
-				     struct sockaddr **nam));
+	int	(*pru_sense) (struct socket *so, struct stat *sb);
+	int	(*pru_shutdown) (struct socket *so);
+	int	(*pru_sockaddr) (struct socket *so, 
+				     struct sockaddr **nam);
 	 
 	/*
 	 * These three added later, so they are out of order.  They are used
@@ -219,28 +219,28 @@ struct pr_usrreqs {
 	 * through these entry points.  For protocols which still use
 	 * the generic code, these just point to those routines.
 	 */
-	int	(*pru_sosend) __P((struct socket *so, struct sockaddr *addr,
+	int	(*pru_sosend) (struct socket *so, struct sockaddr *addr,
 				   struct uio *uio, struct mbuf *top,
 				   struct mbuf *control, int flags,
-				   struct thread *td));
-	int	(*pru_soreceive) __P((struct socket *so, 
+				   struct thread *td);
+	int	(*pru_soreceive) (struct socket *so, 
 				      struct sockaddr **paddr,
 				      struct uio *uio, struct mbuf **mp0,
-				      struct mbuf **controlp, int *flagsp));
-	int	(*pru_sopoll) __P((struct socket *so, int events,
-				     struct ucred *cred, struct thread *td));
+				      struct mbuf **controlp, int *flagsp);
+	int	(*pru_sopoll) (struct socket *so, int events,
+				     struct ucred *cred, struct thread *td);
 };
 
-int	pru_accept_notsupp __P((struct socket *so, struct sockaddr **nam));
-int	pru_connect_notsupp __P((struct socket *so, struct sockaddr *nam,
-				 struct thread *td));
-int	pru_connect2_notsupp __P((struct socket *so1, struct socket *so2));
-int	pru_control_notsupp __P((struct socket *so, u_long cmd, caddr_t data,
-				 struct ifnet *ifp, struct thread *td));
-int	pru_listen_notsupp __P((struct socket *so, struct thread *td));
-int	pru_rcvd_notsupp __P((struct socket *so, int flags));
-int	pru_rcvoob_notsupp __P((struct socket *so, struct mbuf *m, int flags));
-int	pru_sense_null __P((struct socket *so, struct stat *sb));
+int	pru_accept_notsupp (struct socket *so, struct sockaddr **nam);
+int	pru_connect_notsupp (struct socket *so, struct sockaddr *nam,
+				 struct thread *td);
+int	pru_connect2_notsupp (struct socket *so1, struct socket *so2);
+int	pru_control_notsupp (struct socket *so, u_long cmd, caddr_t data,
+				 struct ifnet *ifp, struct thread *td);
+int	pru_listen_notsupp (struct socket *so, struct thread *td);
+int	pru_rcvd_notsupp (struct socket *so, int flags);
+int	pru_rcvoob_notsupp (struct socket *so, struct mbuf *m, int flags);
+int	pru_sense_null (struct socket *so, struct stat *sb);
 
 #endif /* _KERNEL */
 
@@ -314,10 +314,10 @@ char	*prcorequests[] = {
 #endif
 
 #ifdef _KERNEL
-void	pfctlinput __P((int, struct sockaddr *));
-void	pfctlinput2 __P((int, struct sockaddr *, void *));
-struct protosw *pffindproto __P((int family, int protocol, int type));
-struct protosw *pffindtype __P((int family, int type));
+void	pfctlinput (int, struct sockaddr *);
+void	pfctlinput2 (int, struct sockaddr *, void *);
+struct protosw *pffindproto (int family, int protocol, int type);
+struct protosw *pffindtype (int family, int type);
 #endif
 
 #endif
diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h
index f1ed453c91..186048a73d 100644
--- a/sys/sys/ptrace.h
+++ b/sys/sys/ptrace.h
@@ -32,7 +32,7 @@
  *
  *	@(#)ptrace.h	8.2 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/sys/ptrace.h,v 1.10.2.2 2003/01/02 20:39:13 kan Exp $
- * $DragonFly: src/sys/sys/ptrace.h,v 1.3 2003/07/26 18:12:46 dillon Exp $
+ * $DragonFly: src/sys/sys/ptrace.h,v 1.4 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef	_SYS_PTRACE_H_
@@ -72,18 +72,18 @@ struct ptrace_io_desc {
 #define	PIOD_WRITE_I	4	/* Write to I space */
 
 #ifdef _KERNEL
-void	proc_reparent __P((struct proc *child, struct proc *newparent));
-int	ptrace_set_pc __P((struct proc *p, unsigned long addr));
-int	ptrace_single_step __P((struct proc *p));
-int	ptrace_write_u __P((struct proc *p, vm_offset_t off, long data));
-int	kern_ptrace __P((struct proc *p, int req, pid_t pid, void *addr,
-		int data, int *res));
+void	proc_reparent (struct proc *child, struct proc *newparent);
+int	ptrace_set_pc (struct proc *p, unsigned long addr);
+int	ptrace_single_step (struct proc *p);
+int	ptrace_write_u (struct proc *p, vm_offset_t off, long data);
+int	kern_ptrace (struct proc *p, int req, pid_t pid, void *addr,
+		int data, int *res);
 #else /* !_KERNEL */
 
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	ptrace __P((int _request, pid_t _pid, caddr_t _addr, int _data));
+int	ptrace (int _request, pid_t _pid, caddr_t _addr, int _data);
 __END_DECLS
 
 #endif /* !_KERNEL */
diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index be171ee5d7..e59d86fb17 100644
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -32,7 +32,7 @@
  *
  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
  * $FreeBSD: src/sys/sys/queue.h,v 1.32.2.7 2002/04/17 14:21:02 des Exp $
- * $DragonFly: src/sys/sys/queue.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/queue.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_QUEUE_H_
@@ -550,8 +550,8 @@ remque(void *a)
 
 #else /* !__GNUC__ */
 
-void	insque __P((void *a, void *b));
-void	remque __P((void *a));
+void	insque (void *a, void *b);
+void	remque (void *a);
 
 #endif /* __GNUC__ */
 
diff --git a/sys/sys/resource.h b/sys/sys/resource.h
index 475fc2f939..dda0ca9844 100644
--- a/sys/sys/resource.h
+++ b/sys/sys/resource.h
@@ -32,7 +32,7 @@
  *
  *	@(#)resource.h	8.4 (Berkeley) 1/9/95
  * $FreeBSD: src/sys/sys/resource.h,v 1.12.2.2 2002/08/20 18:42:20 dillon Exp $
- * $DragonFly: src/sys/sys/resource.h,v 1.3 2003/07/23 02:30:24 dillon Exp $
+ * $DragonFly: src/sys/sys/resource.h,v 1.4 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_RESOURCE_H_
@@ -135,17 +135,17 @@ struct loadavg {
 #ifdef _KERNEL
 extern struct loadavg averunnable;
 
-int	dosetrlimit __P((u_int which, struct rlimit *limp));
+int	dosetrlimit (u_int which, struct rlimit *limp);
 
 #else
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	getpriority __P((int, int));
-int	getrlimit __P((int, struct rlimit *));
-int	getrusage __P((int, struct rusage *));
-int	setpriority __P((int, int, int));
-int	setrlimit __P((int, const struct rlimit *));
+int	getpriority (int, int));
+int	getrlimit (int, struct rlimit *);
+int	getrusage (int, struct rusage *);
+int	setpriority (int, int, int);
+int	setrlimit (int, const struct rlimit *);
 __END_DECLS
 
 #endif	/* _KERNEL */
diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index ec0d70aedb..da49d3f229 100644
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -32,7 +32,7 @@
  *
  *	@(#)resourcevar.h	8.4 (Berkeley) 1/9/95
  * $FreeBSD: src/sys/sys/resourcevar.h,v 1.16.2.1 2000/09/07 19:13:55 truckman Exp $
- * $DragonFly: src/sys/sys/resourcevar.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/resourcevar.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef	_SYS_RESOURCEVAR_H_
@@ -97,22 +97,22 @@ struct uidinfo {
 #define uihold(uip)	(uip)->ui_ref++
 struct proc;
 
-void	 addupc_intr __P((struct proc *p, u_long pc, u_int ticks));
-void	 addupc_task __P((struct proc *p, u_long pc, u_int ticks));
-void	 calcru __P((struct proc *p, struct timeval *up, struct timeval *sp,
-	    struct timeval *ip));
-int	 chgproccnt __P((struct uidinfo *uip, int diff, int max));
-int	 chgsbsize __P((struct uidinfo *uip, u_long *hiwat, u_long to,
-	    rlim_t max));
-int	 fuswintr __P((void *base));
+void	 addupc_intr (struct proc *p, u_long pc, u_int ticks);
+void	 addupc_task (struct proc *p, u_long pc, u_int ticks);
+void	 calcru (struct proc *p, struct timeval *up, struct timeval *sp,
+	    struct timeval *ip);
+int	 chgproccnt (struct uidinfo *uip, int diff, int max);
+int	 chgsbsize (struct uidinfo *uip, u_long *hiwat, u_long to,
+	    rlim_t max);
+int	 fuswintr (void *base);
 struct plimit
-	*limcopy __P((struct plimit *lim));
-void	 ruadd __P((struct rusage *ru, struct rusage *ru2));
-int	 suswintr __P((void *base, int word));
+	*limcopy (struct plimit *lim);
+void	 ruadd (struct rusage *ru, struct rusage *ru2);
+int	 suswintr (void *base, int word);
 struct uidinfo
-	*uifind __P((uid_t uid));
-int	 uifree __P((struct uidinfo *uip));
-void	uihashinit __P((void));
+	*uifind (uid_t uid);
+int	 uifree (struct uidinfo *uip);
+void	uihashinit (void);
 #endif
 
 #endif	/* !_SYS_RESOURCEVAR_H_ */
diff --git a/sys/sys/rtprio.h b/sys/sys/rtprio.h
index fd1d3de954..9ed32a44c9 100644
--- a/sys/sys/rtprio.h
+++ b/sys/sys/rtprio.h
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/rtprio.h,v 1.9 1999/12/29 04:24:46 peter Exp $
- * $DragonFly: src/sys/sys/rtprio.h,v 1.3 2003/06/30 23:54:04 dillon Exp $
+ * $DragonFly: src/sys/sys/rtprio.h,v 1.4 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_RTPRIO_H_
@@ -76,7 +76,7 @@ struct rtprio {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	rtprio __P((int, pid_t, struct rtprio *));
+int	rtprio (int, pid_t, struct rtprio *);
 __END_DECLS
 #endif	/* !_KERNEL */
 #endif	/* !_SYS_RTPRIO_H_ */
diff --git a/sys/sys/select.h b/sys/sys/select.h
index 0243eb6669..5490af9491 100644
--- a/sys/sys/select.h
+++ b/sys/sys/select.h
@@ -32,7 +32,7 @@
  *
  *	@(#)select.h	8.2 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/sys/select.h,v 1.6.2.1 2000/05/05 03:50:02 jlemon Exp $
- * $DragonFly: src/sys/sys/select.h,v 1.3 2003/06/23 17:55:50 dillon Exp $
+ * $DragonFly: src/sys/sys/select.h,v 1.4 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_SELECT_H_
@@ -54,8 +54,8 @@ struct selinfo {
 #ifdef _KERNEL
 struct thread;
 
-void	selrecord __P((struct thread *selector, struct selinfo *));
-void	selwakeup __P((struct selinfo *));
+void	selrecord (struct thread *selector, struct selinfo *);
+void	selwakeup (struct selinfo *);
 #endif
 
 #endif /* !_SYS_SELECT_H_ */
diff --git a/sys/sys/sem.h b/sys/sys/sem.h
index b7ee2f0018..900a48601a 100644
--- a/sys/sys/sem.h
+++ b/sys/sys/sem.h
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/sys/sem.h,v 1.20.2.2 2000/08/04 22:31:10 peter Exp $ */
-/* $DragonFly: src/sys/sys/sem.h,v 1.2 2003/06/17 04:28:58 dillon Exp $ */
+/* $DragonFly: src/sys/sys/sem.h,v 1.3 2003/08/20 07:31:21 rob Exp $ */
 /*	$NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $	*/
 
 /*
@@ -92,17 +92,17 @@ extern struct seminfo	seminfo;
 /*
  * Process sem_undo vectors at proc exit.
  */
-void	semexit __P((struct proc *p));
+void	semexit (struct proc *p);
 #endif /* _KERNEL */
 
 #ifndef _KERNEL
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int semsys __P((int, ...));
-int semctl __P((int, int, int, ...));
-int semget __P((key_t, int, int));
-int semop __P((int, struct sembuf *,unsigned));
+int semsys (int, ...);
+int semctl (int, int, int, ...);
+int semget (key_t, int, int);
+int semop (int, struct sembuf *,unsigned);
 __END_DECLS
 #endif /* !_KERNEL */
 
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index 139008b0db..8f52e2c07c 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/sys/shm.h,v 1.14 1999/12/29 04:24:46 peter Exp $ */
-/* $DragonFly: src/sys/sys/shm.h,v 1.3 2003/07/23 07:14:19 dillon Exp $ */
+/* $DragonFly: src/sys/sys/shm.h,v 1.4 2003/08/20 07:31:21 rob Exp $ */
 /*	$NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $	*/
 
 /*
@@ -83,18 +83,18 @@ extern struct shmid_ds	*shmsegs;
 struct proc;
 struct vmspace;
 
-void	shmexit __P((struct vmspace *));
-void	shmfork __P((struct proc *, struct proc *));
+void	shmexit (struct vmspace *);
+void	shmfork (struct proc *, struct proc *);
 #else /* !_KERNEL */
 
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int shmsys __P((int, ...));
-void *shmat  __P((int, void *, int));
-int shmget __P((key_t, int, int));
-int shmctl __P((int, int, struct shmid_ds *));
-int shmdt  __P((void *));
+int shmsys (int, ...);
+void *shmat  (int, void *, int);
+int shmget (key_t, int, int);
+int shmctl (int, int, struct shmid_ds *);
+int shmdt  (void *);
 __END_DECLS
 
 #endif /* !_KERNEL */
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index b54ed5f1d3..34a3d833c8 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -37,7 +37,7 @@
  *
  *	@(#)signal.h	8.4 (Berkeley) 5/4/95
  * $FreeBSD: src/sys/sys/signal.h,v 1.23.2.2 2001/04/19 01:38:35 alfred Exp $
- * $DragonFly: src/sys/sys/signal.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/signal.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef	_SYS_SIGNAL_H_
@@ -120,7 +120,7 @@
  * have the same calling protocol so there is no problem in practice.
  * A bit in sa_flags could be used to specify the number of args.
  */
-typedef void __sighandler_t __P((int));
+typedef void __sighandler_t (int);
 
 #define	SIG_DFL		((__sighandler_t *)0)
 #define	SIG_IGN		((__sighandler_t *)1)
@@ -187,9 +187,9 @@ struct __siginfo;
  */
 struct	sigaction {
 	union {
-		void    (*__sa_handler) __P((int));
-		void    (*__sa_sigaction) __P((int, struct __siginfo *,
-					       void *));
+		void    (*__sa_handler) (int);
+		void    (*__sa_sigaction) (int, struct __siginfo *,
+					       void *);
 	} __sigaction_u;		/* signal handler */
 	int	sa_flags;		/* see signal options below */
 	sigset_t sa_mask;		/* signal mask to apply */
@@ -226,7 +226,7 @@ struct	sigaction {
 /* Additional FreeBSD values. */
 #define SI_UNDEFINED	0
 
-typedef void __siginfohandler_t __P((int, struct __siginfo *, void *));
+typedef void __siginfohandler_t (int, struct __siginfo *, void *);
 
 typedef	__sighandler_t	*sig_t;	/* type of pointer to a signal function */
 
@@ -302,7 +302,7 @@ struct	sigstack {
  * defined by <sys/signal.h>.
  */
 __BEGIN_DECLS
-__sighandler_t *signal __P((int, __sighandler_t *));
+__sighandler_t *signal (int, __sighandler_t *);
 __END_DECLS
 
 #endif	/* !_SYS_SIGNAL_H_ */
diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index 18886719cf..4544f9bea1 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -32,7 +32,7 @@
  *
  *	@(#)signalvar.h	8.6 (Berkeley) 2/19/95
  * $FreeBSD: src/sys/sys/signalvar.h,v 1.34.2.1 2000/05/16 06:58:05 dillon Exp $
- * $DragonFly: src/sys/sys/signalvar.h,v 1.4 2003/07/06 21:23:54 dillon Exp $
+ * $DragonFly: src/sys/sys/signalvar.h,v 1.5 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef	_SYS_SIGNALVAR_H_		/* tmp for user.h */
@@ -75,14 +75,14 @@ typedef struct {
 
 struct	osigaction {
 	union {
-		void    (*__sa_handler) __P((int));
-		void    (*__sa_sigaction) __P((int, osiginfo_t *, void *));
+		void    (*__sa_handler) (int);
+		void    (*__sa_sigaction) (int, osiginfo_t *, void *);
 	} __sigaction_u;		/* signal handler */
 	osigset_t	sa_mask;	/* signal mask to apply */
 	int		sa_flags;	/* see signal options below */
 };
 
-typedef void __osiginfohandler_t __P((int, osiginfo_t *, void *));
+typedef void __osiginfohandler_t (int, osiginfo_t *, void *);
 
 /* additional signal action values, used only temporarily/internally */
 #define	SIG_CATCH	((__sighandler_t *)2)
@@ -199,24 +199,24 @@ extern int sugid_coredump;	/* Sysctl variable kern.sugid_coredump */
 /*
  * Machine-independent functions:
  */
-void	check_sigacts __P((void));
-void	execsigs __P((struct proc *p));
-void	gsignal __P((int pgid, int sig));
-int	issignal __P((struct proc *p));
-void	killproc __P((struct proc *p, char *why));
-void	pgsigio __P((struct sigio *, int signum, int checkctty));
-void	pgsignal __P((struct pgrp *pgrp, int sig, int checkctty));
-void	postsig __P((int sig));
-void	psignal __P((struct proc *p, int sig));
-void	siginit __P((struct proc *p));
-void	trapsignal __P((struct proc *p, int sig, u_long code));
-int	__cursig __P((struct proc *p));
+void	check_sigacts (void);
+void	execsigs (struct proc *p);
+void	gsignal (int pgid, int sig);
+int	issignal (struct proc *p);
+void	killproc (struct proc *p, char *why);
+void	pgsigio (struct sigio *, int signum, int checkctty);
+void	pgsignal (struct pgrp *pgrp, int sig, int checkctty);
+void	postsig (int sig);
+void	psignal (struct proc *p, int sig);
+void	siginit (struct proc *p);
+void	trapsignal (struct proc *p, int sig, u_long code);
+int	__cursig (struct proc *p);
 
 /*
  * Machine-dependent functions:
  */
-void	sendsig __P((sig_t action, int sig, sigset_t *retmask, u_long code));
-void	sigexit __P((struct proc *p, int sig));
+void	sendsig (sig_t action, int sig, sigset_t *retmask, u_long code);
+void	sigexit (struct proc *p, int sig);
 
 /*
  * Inline functions:
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index a1f324c3d7..e3e48bebbb 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -32,7 +32,7 @@
  *
  *	@(#)socket.h	8.4 (Berkeley) 2/21/94
  * $FreeBSD: src/sys/sys/socket.h,v 1.39.2.7 2001/07/03 11:02:01 ume Exp $
- * $DragonFly: src/sys/sys/socket.h,v 1.2 2003/06/17 04:28:58 dillon Exp $
+ * $DragonFly: src/sys/sys/socket.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_SOCKET_H_
@@ -435,27 +435,27 @@ struct sf_hdtr {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	accept __P((int, struct sockaddr *, socklen_t *));
-int	bind __P((int, const struct sockaddr *, socklen_t));
-int	connect __P((int, const struct sockaddr *, socklen_t));
-int	getpeername __P((int, struct sockaddr *, socklen_t *));
-int	getsockname __P((int, struct sockaddr *, socklen_t *));
-int	getsockopt __P((int, int, int, void *, socklen_t *));
-int	listen __P((int, int));
-ssize_t	recv __P((int, void *, size_t, int));
-ssize_t	recvfrom __P((int, void *, size_t, int, struct sockaddr *, socklen_t *));
-ssize_t	recvmsg __P((int, struct msghdr *, int));
-ssize_t	send __P((int, const void *, size_t, int));
-ssize_t	sendto __P((int, const void *,
-	    size_t, int, const struct sockaddr *, socklen_t));
-ssize_t	sendmsg __P((int, const struct msghdr *, int));
-int	sendfile __P((int, int, off_t, size_t, struct sf_hdtr *, off_t *, int));
-int	setsockopt __P((int, int, int, const void *, socklen_t));
-int	shutdown __P((int, int));
-int	socket __P((int, int, int));
-int	socketpair __P((int, int, int, int *));
-
-void	pfctlinput __P((int, struct sockaddr *));
+int	accept (int, struct sockaddr *, socklen_t *);
+int	bind (int, const struct sockaddr *, socklen_t);
+int	connect (int, const struct sockaddr *, socklen_t);
+int	getpeername (int, struct sockaddr *, socklen_t *);
+int	getsockname (int, struct sockaddr *, socklen_t *);
+int	getsockopt (int, int, int, void *, socklen_t *);
+int	listen (int, int);
+ssize_t	recv (int, void *, size_t, int);
+ssize_t	recvfrom (int, void *, size_t, int, struct sockaddr *, socklen_t *);
+ssize_t	recvmsg (int, struct msghdr *, int);
+ssize_t	send (int, const void *, size_t, int);
+ssize_t	sendto (int, const void *,
+	    size_t, int, const struct sockaddr *, socklen_t);
+ssize_t	sendmsg (int, const struct msghdr *, int);
+int	sendfile (int, int, off_t, size_t, struct sf_hdtr *, off_t *, int);
+int	setsockopt (int, int, int, const void *, socklen_t);
+int	shutdown (int, int);
+int	socket (int, int, int);
+int	socketpair (int, int, int, int *);
+
+void	pfctlinput (int, struct sockaddr *);
 __END_DECLS
 
 #endif /* !_KERNEL */
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index 8e7ce42139..1b63ee3430 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -32,7 +32,7 @@
  *
  *	@(#)socketvar.h	8.3 (Berkeley) 2/19/95
  * $FreeBSD: src/sys/sys/socketvar.h,v 1.46.2.9 2002/08/14 22:23:10 dg Exp $
- * $DragonFly: src/sys/sys/socketvar.h,v 1.3 2003/06/25 03:56:10 dillon Exp $
+ * $DragonFly: src/sys/sys/socketvar.h,v 1.4 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_SOCKETVAR_H_
@@ -108,7 +108,7 @@ struct socket {
 #define SB_AIO		0x80		/* AIO operations queued */
 #define SB_KNOTE	0x100		/* kernel note attached */
 
-	void	(*so_upcall) __P((struct socket *, void *, int));
+	void	(*so_upcall) (struct socket *, void *, int);
 	void	*so_upcallarg;
 	struct	ucred *so_cred;		/* user credentials */
 	/* NB: generation count must not be first; easiest to make it last. */
@@ -280,11 +280,11 @@ struct sf_buf {
 struct accept_filter {
 	char	accf_name[16];
 	void	(*accf_callback)
-		__P((struct socket *so, void *arg, int waitflag));
+		(struct socket *so, void *arg, int waitflag);
 	void *	(*accf_create)
-		__P((struct socket *so, char *arg));
+		(struct socket *so, char *arg);
 	void	(*accf_destroy)
-		__P((struct socket *so));
+		(struct socket *so);
 	SLIST_ENTRY(accept_filter) accf_next;	/* next on the list */
 };
 
@@ -311,101 +311,101 @@ struct knote;
 /*
  * File operations on sockets.
  */
-int	soo_read __P((struct file *fp, struct uio *uio, struct ucred *cred,
-	    int flags, struct thread *td));
-int	soo_write __P((struct file *fp, struct uio *uio, struct ucred *cred,
-	    int flags, struct thread *td));
-int	soo_close __P((struct file *fp, struct thread *td));
-int	soo_ioctl __P((struct file *fp, u_long cmd, caddr_t data,
-	    struct thread *td));
-int	soo_poll __P((struct file *fp, int events, struct ucred *cred,
-	    struct thread *td));
-int	soo_stat __P((struct file *fp, struct stat *ub, struct thread *td));
-int	sokqfilter __P((struct file *fp, struct knote *kn));
+int	soo_read (struct file *fp, struct uio *uio, struct ucred *cred,
+	    int flags, struct thread *td);
+int	soo_write (struct file *fp, struct uio *uio, struct ucred *cred,
+	    int flags, struct thread *td);
+int	soo_close (struct file *fp, struct thread *td);
+int	soo_ioctl (struct file *fp, u_long cmd, caddr_t data,
+	    struct thread *td);
+int	soo_poll (struct file *fp, int events, struct ucred *cred,
+	    struct thread *td);
+int	soo_stat (struct file *fp, struct stat *ub, struct thread *td);
+int	sokqfilter (struct file *fp, struct knote *kn);
 
 /*
  * From uipc_socket and friends
  */
-struct	sockaddr *dup_sockaddr __P((struct sockaddr *sa, int canwait));
-int	holdsock __P((struct filedesc *fdp, int fdes, struct file **fpp));
-int	sockargs __P((struct mbuf **mp, caddr_t buf, int buflen, int type));
-int	getsockaddr __P((struct sockaddr **namp, caddr_t uaddr, size_t len));
-void	sbappend __P((struct sockbuf *sb, struct mbuf *m));
-int	sbappendaddr __P((struct sockbuf *sb, struct sockaddr *asa,
-	    struct mbuf *m0, struct mbuf *control));
-int	sbappendcontrol __P((struct sockbuf *sb, struct mbuf *m0,
-	    struct mbuf *control));
-void	sbappendrecord __P((struct sockbuf *sb, struct mbuf *m0));
-void	sbcheck __P((struct sockbuf *sb));
-void	sbcompress __P((struct sockbuf *sb, struct mbuf *m, struct mbuf *n));
+struct	sockaddr *dup_sockaddr (struct sockaddr *sa, int canwait);
+int	holdsock (struct filedesc *fdp, int fdes, struct file **fpp);
+int	sockargs (struct mbuf **mp, caddr_t buf, int buflen, int type);
+int	getsockaddr (struct sockaddr **namp, caddr_t uaddr, size_t len);
+void	sbappend (struct sockbuf *sb, struct mbuf *m);
+int	sbappendaddr (struct sockbuf *sb, struct sockaddr *asa,
+	    struct mbuf *m0, struct mbuf *control);
+int	sbappendcontrol (struct sockbuf *sb, struct mbuf *m0,
+	    struct mbuf *control);
+void	sbappendrecord (struct sockbuf *sb, struct mbuf *m0);
+void	sbcheck (struct sockbuf *sb);
+void	sbcompress (struct sockbuf *sb, struct mbuf *m, struct mbuf *n);
 struct mbuf *
-	sbcreatecontrol __P((caddr_t p, int size, int type, int level));
-void	sbdrop __P((struct sockbuf *sb, int len));
-void	sbdroprecord __P((struct sockbuf *sb));
-void	sbflush __P((struct sockbuf *sb));
-void	sbinsertoob __P((struct sockbuf *sb, struct mbuf *m0));
-void	sbrelease __P((struct sockbuf *sb, struct socket *so));
-int	sbreserve __P((struct sockbuf *sb, u_long cc, struct socket *so,
-		       struct proc *p));
-void	sbtoxsockbuf __P((struct sockbuf *sb, struct xsockbuf *xsb));
-int	sbwait __P((struct sockbuf *sb));
-int	sb_lock __P((struct sockbuf *sb));
+	sbcreatecontrol (caddr_t p, int size, int type, int level);
+void	sbdrop (struct sockbuf *sb, int len);
+void	sbdroprecord (struct sockbuf *sb);
+void	sbflush (struct sockbuf *sb);
+void	sbinsertoob (struct sockbuf *sb, struct mbuf *m0);
+void	sbrelease (struct sockbuf *sb, struct socket *so);
+int	sbreserve (struct sockbuf *sb, u_long cc, struct socket *so,
+		       struct proc *p);
+void	sbtoxsockbuf (struct sockbuf *sb, struct xsockbuf *xsb);
+int	sbwait (struct sockbuf *sb);
+int	sb_lock (struct sockbuf *sb);
 struct sf_buf *
 	sf_buf_alloc(void);
 void	sf_buf_free(caddr_t addr, u_int size);
 void	sf_buf_ref(caddr_t addr, u_int size);
-int	soabort __P((struct socket *so));
-int	soaccept __P((struct socket *so, struct sockaddr **nam));
-struct	socket *soalloc __P((int waitok));
-int	sobind __P((struct socket *so, struct sockaddr *nam, struct thread *td));
-void	socantrcvmore __P((struct socket *so));
-void	socantsendmore __P((struct socket *so));
-int	soclose __P((struct socket *so));
-int	soconnect __P((struct socket *so, struct sockaddr *nam, struct thread *td));
-int	soconnect2 __P((struct socket *so1, struct socket *so2));
-int	socreate __P((int dom, struct socket **aso, int type, int proto,
-	    struct thread *td));
-void	sodealloc __P((struct socket *so));
-int	sodisconnect __P((struct socket *so));
-void	sofree __P((struct socket *so));
-int	sogetopt __P((struct socket *so, struct sockopt *sopt));
-void	sohasoutofband __P((struct socket *so));
-void	soisconnected __P((struct socket *so));
-void	soisconnecting __P((struct socket *so));
-void	soisdisconnected __P((struct socket *so));
-void	soisdisconnecting __P((struct socket *so));
-int	solisten __P((struct socket *so, int backlog, struct thread *td));
-struct socket *sonewconn __P((struct socket *head, int connstatus));
-int	sooptcopyin __P((struct sockopt *sopt, void *buf, size_t len,
-			 size_t minlen));
-int	sooptcopyout __P((struct sockopt *sopt, void *buf, size_t len));
+int	soabort (struct socket *so);
+int	soaccept (struct socket *so, struct sockaddr **nam);
+struct	socket *soalloc (int waitok);
+int	sobind (struct socket *so, struct sockaddr *nam, struct thread *td);
+void	socantrcvmore (struct socket *so);
+void	socantsendmore (struct socket *so);
+int	soclose (struct socket *so);
+int	soconnect (struct socket *so, struct sockaddr *nam, struct thread *td);
+int	soconnect2 (struct socket *so1, struct socket *so2);
+int	socreate (int dom, struct socket **aso, int type, int proto,
+	    struct thread *td);
+void	sodealloc (struct socket *so);
+int	sodisconnect (struct socket *so);
+void	sofree (struct socket *so);
+int	sogetopt (struct socket *so, struct sockopt *sopt);
+void	sohasoutofband (struct socket *so);
+void	soisconnected (struct socket *so);
+void	soisconnecting (struct socket *so);
+void	soisdisconnected (struct socket *so);
+void	soisdisconnecting (struct socket *so);
+int	solisten (struct socket *so, int backlog, struct thread *td);
+struct socket *sonewconn (struct socket *head, int connstatus);
+int	sooptcopyin (struct sockopt *sopt, void *buf, size_t len,
+			 size_t minlen);
+int	sooptcopyout (struct sockopt *sopt, void *buf, size_t len);
 
 /* XXX; prepare mbuf for (__FreeBSD__ < 3) routines. */
-int	soopt_getm __P((struct sockopt *sopt, struct mbuf **mp));
-int	soopt_mcopyin __P((struct sockopt *sopt, struct mbuf *m));
-int	soopt_mcopyout __P((struct sockopt *sopt, struct mbuf *m));
+int	soopt_getm (struct sockopt *sopt, struct mbuf **mp);
+int	soopt_mcopyin (struct sockopt *sopt, struct mbuf *m);
+int	soopt_mcopyout (struct sockopt *sopt, struct mbuf *m);
 
-int	sopoll __P((struct socket *so, int events, struct ucred *cred,
-		    struct thread *td));
-int	soreceive __P((struct socket *so, struct sockaddr **paddr,
+int	sopoll (struct socket *so, int events, struct ucred *cred,
+		    struct thread *td);
+int	soreceive (struct socket *so, struct sockaddr **paddr,
 		       struct uio *uio, struct mbuf **mp0,
-		       struct mbuf **controlp, int *flagsp));
-int	soreserve __P((struct socket *so, u_long sndcc, u_long rcvcc));
-void	sorflush __P((struct socket *so));
-int	sosend __P((struct socket *so, struct sockaddr *addr, struct uio *uio,
+		       struct mbuf **controlp, int *flagsp);
+int	soreserve (struct socket *so, u_long sndcc, u_long rcvcc);
+void	sorflush (struct socket *so);
+int	sosend (struct socket *so, struct sockaddr *addr, struct uio *uio,
 		    struct mbuf *top, struct mbuf *control, int flags,
-		    struct thread *td));
-int	sosetopt __P((struct socket *so, struct sockopt *sopt));
-int	soshutdown __P((struct socket *so, int how));
-void	sotoxsocket __P((struct socket *so, struct xsocket *xso));
-void	sowakeup __P((struct socket *so, struct sockbuf *sb));
+		    struct thread *td);
+int	sosetopt (struct socket *so, struct sockopt *sopt);
+int	soshutdown (struct socket *so, int how);
+void	sotoxsocket (struct socket *so, struct xsocket *xso);
+void	sowakeup (struct socket *so, struct sockbuf *sb);
 
 /* accept filter functions */
-int	accept_filt_add __P((struct accept_filter *filt));
-int	accept_filt_del __P((char *name));
-struct accept_filter *	accept_filt_get __P((char *name));
+int	accept_filt_add (struct accept_filter *filt);
+int	accept_filt_del (char *name);
+struct accept_filter *	accept_filt_get (char *name);
 #ifdef ACCEPT_FILTER_MOD
-int accept_filt_generic_mod_event __P((module_t mod, int event, void *data));
+int accept_filt_generic_mod_event (module_t mod, int event, void *data);
 SYSCTL_DECL(_net_inet_accf);
 #endif /* ACCEPT_FILTER_MOD */
 
diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h
index 6124c5cd72..7168bf3c6c 100644
--- a/sys/sys/soundcard.h
+++ b/sys/sys/soundcard.h
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/soundcard.h,v 1.33.2.4 2003/06/07 21:31:56 mbr Exp $
- * $DragonFly: src/sys/sys/soundcard.h,v 1.2 2003/06/17 04:28:59 dillon Exp $
+ * $DragonFly: src/sys/sys/soundcard.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_SOUNDCARD_H_
@@ -1136,7 +1136,7 @@ typedef struct copr_msg {
  */
 
 #ifndef USE_SIMPLE_MACROS
-void seqbuf_dump __P((void));	/* This function must be provided by programs */
+void seqbuf_dump (void);	/* This function must be provided by programs */
 
 /* Sample seqbuf_dump() implementation:
  *
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index 1b16e07f19..1a722eb3ee 100644
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -37,7 +37,7 @@
  *
  *	@(#)stat.h	8.12 (Berkeley) 6/16/95
  * $FreeBSD: src/sys/sys/stat.h,v 1.20 1999/12/29 04:24:47 peter Exp $
- * $DragonFly: src/sys/sys/stat.h,v 1.2 2003/06/17 04:28:59 dillon Exp $
+ * $DragonFly: src/sys/sys/stat.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_STAT_H_
@@ -240,19 +240,19 @@ struct nstat {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	chmod __P((const char *, mode_t));
-int	fstat __P((int, struct stat *));
-int	mkdir __P((const char *, mode_t));
-int	mkfifo __P((const char *, mode_t));
-int	stat __P((const char *, struct stat *));
-mode_t	umask __P((mode_t));
+int	chmod (const char *, mode_t);
+int	fstat (int, struct stat *);
+int	mkdir (const char *, mode_t);
+int	mkfifo (const char *, mode_t);
+int	stat (const char *, struct stat *);
+mode_t	umask (mode_t);
 
 #ifndef _POSIX_SOURCE
-int	chflags __P((const char *, u_long));
-int	fchflags __P((int, u_long));
-int	fchmod __P((int, mode_t));
-int	lchmod __P((const char *, mode_t));
-int	lstat __P((const char *, struct stat *));
+int	chflags (const char *, u_long);
+int	fchflags (int, u_long);
+int	fchmod (int, mode_t);
+int	lchmod (const char *, mode_t);
+int	lstat (const char *, struct stat *);
 #endif
 __END_DECLS
 
diff --git a/sys/sys/syscall-hide.h b/sys/sys/syscall-hide.h
index ea92871476..eb554c63c9 100644
--- a/sys/sys/syscall-hide.h
+++ b/sys/sys/syscall-hide.h
@@ -2,7 +2,7 @@
  * System call hiders.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $DragonFly: src/sys/sys/syscall-hide.h,v 1.7 2003/08/12 02:36:15 dillon Exp $
+ * $DragonFly: src/sys/sys/syscall-hide.h,v 1.8 2003/08/20 07:31:21 rob Exp $
  * created from DragonFly: src/sys/kern/syscalls.master,v 1.2 2003/06/17 04:28:41 dillon Exp 
  */
 
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index c5cea5293e..332c5ede4e 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $DragonFly: src/sys/sys/syscall.h,v 1.7 2003/08/12 02:36:15 dillon Exp $
+ * $DragonFly: src/sys/sys/syscall.h,v 1.8 2003/08/20 07:31:21 rob Exp $
  * created from DragonFly: src/sys/kern/syscalls.master,v 1.2 2003/06/17 04:28:41 dillon Exp 
  */
 
diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index 9833c22df4..55e993c0c5 100644
--- a/sys/sys/syscall.mk
+++ b/sys/sys/syscall.mk
@@ -1,6 +1,6 @@
 # DragonFly system call names.
 # DO NOT EDIT-- this file is automatically generated.
-# $DragonFly: src/sys/sys/syscall.mk,v 1.7 2003/08/12 02:36:15 dillon Exp $
+# $DragonFly: src/sys/sys/syscall.mk,v 1.8 2003/08/20 07:31:21 rob Exp $
 # created from DragonFly: src/sys/kern/syscalls.master,v 1.2 2003/06/17 04:28:41 dillon Exp 
 MIASM =  \
 	syscall.o \
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index 8e3712579d..2bcfa5e19c 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -35,7 +35,7 @@
  *
  *	@(#)sysctl.h	8.1 (Berkeley) 6/2/93
  * $FreeBSD: src/sys/sys/sysctl.h,v 1.81.2.10 2003/05/01 22:48:09 trhodes Exp $
- * $DragonFly: src/sys/sys/sysctl.h,v 1.5 2003/06/29 06:48:29 dillon Exp $
+ * $DragonFly: src/sys/sys/sysctl.h,v 1.6 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_SYSCTL_H_
@@ -609,9 +609,9 @@ int	sysctl_find_oid(int *name, u_int namelen, struct sysctl_oid **noid,
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
-int	sysctlbyname __P((const char *, void *, size_t *, void *, size_t));
-int	sysctlnametomib __P((const char *, int *, size_t *));
+int	sysctl (int *, u_int, void *, size_t *, void *, size_t);
+int	sysctlbyname (const char *, void *, size_t *, void *, size_t);
+int	sysctlnametomib (const char *, int *, size_t *));
 __END_DECLS
 #endif	/* _KERNEL */
 
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index ffc55ea0ce..72d8e570ba 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/sysent.h,v 1.27.2.5 2002/03/17 11:08:38 alfred Exp $
- * $DragonFly: src/sys/sys/sysent.h,v 1.4 2003/08/12 02:36:15 dillon Exp $
+ * $DragonFly: src/sys/sys/sysent.h,v 1.5 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_SYSENT_H_
@@ -39,7 +39,7 @@
 
 struct proc;
 
-typedef	int	sy_call_t __P((void *));
+typedef	int	sy_call_t (void *);
 
 struct sysent {		/* system call table */
 	int	sy_narg;	/* number of arguments */
@@ -65,22 +65,22 @@ struct sysentvec {
 	int		*sv_sigtbl;	/* signal translation table */
 	int		sv_errsize;	/* size of errno translation table */
 	int 		*sv_errtbl;	/* errno translation table */
-	int		(*sv_transtrap) __P((int, int));
+	int		(*sv_transtrap) (int, int);
 					/* translate trap-to-signal mapping */
-	int		(*sv_fixup) __P((register_t **, struct image_params *));
+	int		(*sv_fixup) (register_t **, struct image_params *);
 					/* stack fixup function */
-	void		(*sv_sendsig) __P((void (*)(int), int,
-					   struct __sigset *, u_long));
+	void		(*sv_sendsig) (void (*)(int), int,
+					   struct __sigset *, u_long);
 					/* send signal */
 	char 		*sv_sigcode;	/* start of sigtramp code */
 	int 		*sv_szsigcode;	/* size of sigtramp code */
-	void		(*sv_prepsyscall) __P((struct trapframe *, int *,
-					       u_int *, caddr_t *));
+	void		(*sv_prepsyscall) (struct trapframe *, int *,
+					       u_int *, caddr_t *);
 	char		*sv_name;	/* name of binary type */
-	int		(*sv_coredump) __P((struct proc *, struct vnode *,
-					    off_t));
+	int		(*sv_coredump) (struct proc *, struct vnode *,
+					    off_t);
 					/* function to dump core, or NULL */
-	int		(*sv_imgact_try) __P((struct image_params *));
+	int		(*sv_imgact_try) (struct image_params *);
 	int		sv_minsigstksz;	/* minimum signal stack size */
 };
 
@@ -123,10 +123,10 @@ SYSCALL_MODULE(syscallname,                             \
     & syscallname##_syscall, & syscallname##_sysent,    \
     NULL, NULL);
 
-int    syscall_register __P((int *offset, struct sysent *new_sysent,
-                             struct sysent *old_sysent));
-int    syscall_deregister __P((int *offset, struct sysent *old_sysent));
-int    syscall_module_handler __P((struct module *mod, int what, void *arg));
+int    syscall_register (int *offset, struct sysent *new_sysent,
+                             struct sysent *old_sysent);
+int    syscall_deregister (int *offset, struct sysent *old_sysent);
+int    syscall_module_handler (struct module *mod, int what, void *arg);
 
 #endif /* _KERNEL */
 
diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h
index c909fb40f4..2733f5e0e9 100644
--- a/sys/sys/syslog.h
+++ b/sys/sys/syslog.h
@@ -32,7 +32,7 @@
  *
  *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
  * $FreeBSD: src/sys/sys/syslog.h,v 1.19.2.2 2001/05/29 13:15:08 dwmalone Exp $
- * $DragonFly: src/sys/sys/syslog.h,v 1.2 2003/06/17 04:28:59 dillon Exp $
+ * $DragonFly: src/sys/sys/syslog.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_SYSLOG_H_
@@ -193,11 +193,11 @@ CODE facilitynames[] = {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-void	closelog __P((void));
-void	openlog __P((const char *, int, int));
-int	setlogmask __P((int));
-void	syslog __P((int, const char *, ...)) __printflike(2, 3);
-void	vsyslog __P((int, const char *, _BSD_VA_LIST_)) __printflike(2, 0);
+void	closelog (void);
+void	openlog (const char *, int, int);
+int	setlogmask (int);
+void	syslog (int, const char *, ...) __printflike(2, 3);
+void	vsyslog (int, const char *, _BSD_VA_LIST_) __printflike(2, 0);
 __END_DECLS
 
 #endif /* !_KERNEL */
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index b03aa5b438..c7152f8b76 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -2,7 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $DragonFly: src/sys/sys/sysproto.h,v 1.7 2003/08/12 02:36:15 dillon Exp $
+ * $DragonFly: src/sys/sys/sysproto.h,v 1.8 2003/08/20 07:31:21 rob Exp $
  * created from DragonFly: src/sys/kern/syscalls.master,v 1.2 2003/06/17 04:28:41 dillon Exp 
  */
 
@@ -1966,237 +1966,237 @@ struct	sendfile_args {
 
 #ifdef _KERNEL
 
-int	nosys __P((struct nosys_args *));
-void	sys_exit __P((struct sys_exit_args *));
-int	fork __P((struct fork_args *));
-int	read __P((struct read_args *));
-int	write __P((struct write_args *));
-int	open __P((struct open_args *));
-int	close __P((struct close_args *));
-int	wait4 __P((struct wait_args *));
-int	link __P((struct link_args *));
-int	unlink __P((struct unlink_args *));
-int	chdir __P((struct chdir_args *));
-int	fchdir __P((struct fchdir_args *));
-int	mknod __P((struct mknod_args *));
-int	chmod __P((struct chmod_args *));
-int	chown __P((struct chown_args *));
-int	obreak __P((struct obreak_args *));
-int	getfsstat __P((struct getfsstat_args *));
-int	getpid __P((struct getpid_args *));
-int	mount __P((struct mount_args *));
-int	unmount __P((struct unmount_args *));
-int	setuid __P((struct setuid_args *));
-int	getuid __P((struct getuid_args *));
-int	geteuid __P((struct geteuid_args *));
-int	ptrace __P((struct ptrace_args *));
-int	recvmsg __P((struct recvmsg_args *));
-int	sendmsg __P((struct sendmsg_args *));
-int	recvfrom __P((struct recvfrom_args *));
-int	accept __P((struct accept_args *));
-int	getpeername __P((struct getpeername_args *));
-int	getsockname __P((struct getsockname_args *));
-int	access __P((struct access_args *));
-int	chflags __P((struct chflags_args *));
-int	fchflags __P((struct fchflags_args *));
-int	sync __P((struct sync_args *));
-int	kill __P((struct kill_args *));
-int	getppid __P((struct getppid_args *));
-int	dup __P((struct dup_args *));
-int	pipe __P((struct pipe_args *));
-int	getegid __P((struct getegid_args *));
-int	profil __P((struct profil_args *));
-int	ktrace __P((struct ktrace_args *));
-int	getgid __P((struct getgid_args *));
-int	getlogin __P((struct getlogin_args *));
-int	setlogin __P((struct setlogin_args *));
-int	acct __P((struct acct_args *));
-int	sigaltstack __P((struct sigaltstack_args *));
-int	ioctl __P((struct ioctl_args *));
-int	reboot __P((struct reboot_args *));
-int	revoke __P((struct revoke_args *));
-int	symlink __P((struct symlink_args *));
-int	readlink __P((struct readlink_args *));
-int	execve __P((struct execve_args *));
-int	umask __P((struct umask_args *));
-int	chroot __P((struct chroot_args *));
-int	msync __P((struct msync_args *));
-int	vfork __P((struct vfork_args *));
-int	sbrk __P((struct sbrk_args *));
-int	sstk __P((struct sstk_args *));
-int	ovadvise __P((struct ovadvise_args *));
-int	munmap __P((struct munmap_args *));
-int	mprotect __P((struct mprotect_args *));
-int	madvise __P((struct madvise_args *));
-int	mincore __P((struct mincore_args *));
-int	getgroups __P((struct getgroups_args *));
-int	setgroups __P((struct setgroups_args *));
-int	getpgrp __P((struct getpgrp_args *));
-int	setpgid __P((struct setpgid_args *));
-int	setitimer __P((struct setitimer_args *));
-int	swapon __P((struct swapon_args *));
-int	getitimer __P((struct getitimer_args *));
-int	getdtablesize __P((struct getdtablesize_args *));
-int	dup2 __P((struct dup2_args *));
-int	fcntl __P((struct fcntl_args *));
-int	select __P((struct select_args *));
-int	fsync __P((struct fsync_args *));
-int	setpriority __P((struct setpriority_args *));
-int	socket __P((struct socket_args *));
-int	connect __P((struct connect_args *));
-int	getpriority __P((struct getpriority_args *));
-int	bind __P((struct bind_args *));
-int	setsockopt __P((struct setsockopt_args *));
-int	listen __P((struct listen_args *));
-int	gettimeofday __P((struct gettimeofday_args *));
-int	getrusage __P((struct getrusage_args *));
-int	getsockopt __P((struct getsockopt_args *));
-int	readv __P((struct readv_args *));
-int	writev __P((struct writev_args *));
-int	settimeofday __P((struct settimeofday_args *));
-int	fchown __P((struct fchown_args *));
-int	fchmod __P((struct fchmod_args *));
-int	setreuid __P((struct setreuid_args *));
-int	setregid __P((struct setregid_args *));
-int	rename __P((struct rename_args *));
-int	flock __P((struct flock_args *));
-int	mkfifo __P((struct mkfifo_args *));
-int	sendto __P((struct sendto_args *));
-int	shutdown __P((struct shutdown_args *));
-int	socketpair __P((struct socketpair_args *));
-int	mkdir __P((struct mkdir_args *));
-int	rmdir __P((struct rmdir_args *));
-int	utimes __P((struct utimes_args *));
-int	adjtime __P((struct adjtime_args *));
-int	setsid __P((struct setsid_args *));
-int	quotactl __P((struct quotactl_args *));
-int	nfssvc __P((struct nfssvc_args *));
-int	statfs __P((struct statfs_args *));
-int	fstatfs __P((struct fstatfs_args *));
-int	getfh __P((struct getfh_args *));
-int	getdomainname __P((struct getdomainname_args *));
-int	setdomainname __P((struct setdomainname_args *));
-int	uname __P((struct uname_args *));
-int	sysarch __P((struct sysarch_args *));
-int	rtprio __P((struct rtprio_args *));
-int	semsys __P((struct semsys_args *));
-int	msgsys __P((struct msgsys_args *));
-int	shmsys __P((struct shmsys_args *));
-int	pread __P((struct pread_args *));
-int	pwrite __P((struct pwrite_args *));
-int	ntp_adjtime __P((struct ntp_adjtime_args *));
-int	setgid __P((struct setgid_args *));
-int	setegid __P((struct setegid_args *));
-int	seteuid __P((struct seteuid_args *));
-int	stat __P((struct stat_args *));
-int	fstat __P((struct fstat_args *));
-int	lstat __P((struct lstat_args *));
-int	pathconf __P((struct pathconf_args *));
-int	fpathconf __P((struct fpathconf_args *));
-int	getrlimit __P((struct __getrlimit_args *));
-int	setrlimit __P((struct __setrlimit_args *));
-int	getdirentries __P((struct getdirentries_args *));
-int	mmap __P((struct mmap_args *));
-int	lseek __P((struct lseek_args *));
-int	truncate __P((struct truncate_args *));
-int	ftruncate __P((struct ftruncate_args *));
-int	__sysctl __P((struct sysctl_args *));
-int	mlock __P((struct mlock_args *));
-int	munlock __P((struct munlock_args *));
-int	undelete __P((struct undelete_args *));
-int	futimes __P((struct futimes_args *));
-int	getpgid __P((struct getpgid_args *));
-int	poll __P((struct poll_args *));
-int	lkmnosys __P((struct nosys_args *));
-int	__semctl __P((struct __semctl_args *));
-int	semget __P((struct semget_args *));
-int	semop __P((struct semop_args *));
-int	msgctl __P((struct msgctl_args *));
-int	msgget __P((struct msgget_args *));
-int	msgsnd __P((struct msgsnd_args *));
-int	msgrcv __P((struct msgrcv_args *));
-int	shmat __P((struct shmat_args *));
-int	shmctl __P((struct shmctl_args *));
-int	shmdt __P((struct shmdt_args *));
-int	shmget __P((struct shmget_args *));
-int	clock_gettime __P((struct clock_gettime_args *));
-int	clock_settime __P((struct clock_settime_args *));
-int	clock_getres __P((struct clock_getres_args *));
-int	nanosleep __P((struct nanosleep_args *));
-int	minherit __P((struct minherit_args *));
-int	rfork __P((struct rfork_args *));
-int	openbsd_poll __P((struct openbsd_poll_args *));
-int	issetugid __P((struct issetugid_args *));
-int	lchown __P((struct lchown_args *));
-int	getdents __P((struct getdents_args *));
-int	lchmod __P((struct lchmod_args *));
-int	lutimes __P((struct lutimes_args *));
-int	nstat __P((struct nstat_args *));
-int	nfstat __P((struct nfstat_args *));
-int	nlstat __P((struct nlstat_args *));
-int	fhstatfs __P((struct fhstatfs_args *));
-int	fhopen __P((struct fhopen_args *));
-int	fhstat __P((struct fhstat_args *));
-int	modnext __P((struct modnext_args *));
-int	modstat __P((struct modstat_args *));
-int	modfnext __P((struct modfnext_args *));
-int	modfind __P((struct modfind_args *));
-int	kldload __P((struct kldload_args *));
-int	kldunload __P((struct kldunload_args *));
-int	kldfind __P((struct kldfind_args *));
-int	kldnext __P((struct kldnext_args *));
-int	kldstat __P((struct kldstat_args *));
-int	kldfirstmod __P((struct kldfirstmod_args *));
-int	getsid __P((struct getsid_args *));
-int	setresuid __P((struct setresuid_args *));
-int	setresgid __P((struct setresgid_args *));
-int	aio_return __P((struct aio_return_args *));
-int	aio_suspend __P((struct aio_suspend_args *));
-int	aio_cancel __P((struct aio_cancel_args *));
-int	aio_error __P((struct aio_error_args *));
-int	aio_read __P((struct aio_read_args *));
-int	aio_write __P((struct aio_write_args *));
-int	lio_listio __P((struct lio_listio_args *));
-int	yield __P((struct yield_args *));
-int	thr_sleep __P((struct thr_sleep_args *));
-int	thr_wakeup __P((struct thr_wakeup_args *));
-int	mlockall __P((struct mlockall_args *));
-int	munlockall __P((struct munlockall_args *));
-int	__getcwd __P((struct __getcwd_args *));
-int	sched_setparam __P((struct sched_setparam_args *));
-int	sched_getparam __P((struct sched_getparam_args *));
-int	sched_setscheduler __P((struct sched_setscheduler_args *));
-int	sched_getscheduler __P((struct sched_getscheduler_args *));
-int	sched_yield __P((struct sched_yield_args *));
-int	sched_get_priority_max __P((struct sched_get_priority_max_args *));
-int	sched_get_priority_min __P((struct sched_get_priority_min_args *));
-int	sched_rr_get_interval __P((struct sched_rr_get_interval_args *));
-int	utrace __P((struct utrace_args *));
-int	kldsym __P((struct kldsym_args *));
-int	jail __P((struct jail_args *));
-int	sigprocmask __P((struct sigprocmask_args *));
-int	sigsuspend __P((struct sigsuspend_args *));
-int	sigaction __P((struct sigaction_args *));
-int	sigpending __P((struct sigpending_args *));
-int	sigreturn __P((struct sigreturn_args *));
-int	__acl_get_file __P((struct __acl_get_file_args *));
-int	__acl_set_file __P((struct __acl_set_file_args *));
-int	__acl_get_fd __P((struct __acl_get_fd_args *));
-int	__acl_set_fd __P((struct __acl_set_fd_args *));
-int	__acl_delete_file __P((struct __acl_delete_file_args *));
-int	__acl_delete_fd __P((struct __acl_delete_fd_args *));
-int	__acl_aclcheck_file __P((struct __acl_aclcheck_file_args *));
-int	__acl_aclcheck_fd __P((struct __acl_aclcheck_fd_args *));
-int	extattrctl __P((struct extattrctl_args *));
-int	extattr_set_file __P((struct extattr_set_file_args *));
-int	extattr_get_file __P((struct extattr_get_file_args *));
-int	extattr_delete_file __P((struct extattr_delete_file_args *));
-int	aio_waitcomplete __P((struct aio_waitcomplete_args *));
-int	getresuid __P((struct getresuid_args *));
-int	getresgid __P((struct getresgid_args *));
-int	kqueue __P((struct kqueue_args *));
-int	kevent __P((struct kevent_args *));
-int	sendfile __P((struct sendfile_args *));
+int	nosys (struct nosys_args *);
+void	sys_exit (struct sys_exit_args *);
+int	fork (struct fork_args *);
+int	read (struct read_args *);
+int	write (struct write_args *);
+int	open (struct open_args *);
+int	close (struct close_args *);
+int	wait4 (struct wait_args *);
+int	link (struct link_args *);
+int	unlink (struct unlink_args *);
+int	chdir (struct chdir_args *);
+int	fchdir (struct fchdir_args *);
+int	mknod (struct mknod_args *);
+int	chmod (struct chmod_args *);
+int	chown (struct chown_args *);
+int	obreak (struct obreak_args *);
+int	getfsstat (struct getfsstat_args *);
+int	getpid (struct getpid_args *);
+int	mount (struct mount_args *);
+int	unmount (struct unmount_args *);
+int	setuid (struct setuid_args *);
+int	getuid (struct getuid_args *);
+int	geteuid (struct geteuid_args *);
+int	ptrace (struct ptrace_args *);
+int	recvmsg (struct recvmsg_args *);
+int	sendmsg (struct sendmsg_args *);
+int	recvfrom (struct recvfrom_args *);
+int	accept (struct accept_args *);
+int	getpeername (struct getpeername_args *);
+int	getsockname (struct getsockname_args *);
+int	access (struct access_args *);
+int	chflags (struct chflags_args *);
+int	fchflags (struct fchflags_args *);
+int	sync (struct sync_args *);
+int	kill (struct kill_args *);
+int	getppid (struct getppid_args *);
+int	dup (struct dup_args *);
+int	pipe (struct pipe_args *);
+int	getegid (struct getegid_args *);
+int	profil (struct profil_args *);
+int	ktrace (struct ktrace_args *);
+int	getgid (struct getgid_args *);
+int	getlogin (struct getlogin_args *);
+int	setlogin (struct setlogin_args *);
+int	acct (struct acct_args *);
+int	sigaltstack (struct sigaltstack_args *);
+int	ioctl (struct ioctl_args *);
+int	reboot (struct reboot_args *);
+int	revoke (struct revoke_args *);
+int	symlink (struct symlink_args *);
+int	readlink (struct readlink_args *);
+int	execve (struct execve_args *);
+int	umask (struct umask_args *);
+int	chroot (struct chroot_args *);
+int	msync (struct msync_args *);
+int	vfork (struct vfork_args *);
+int	sbrk (struct sbrk_args *);
+int	sstk (struct sstk_args *);
+int	ovadvise (struct ovadvise_args *);
+int	munmap (struct munmap_args *);
+int	mprotect (struct mprotect_args *);
+int	madvise (struct madvise_args *);
+int	mincore (struct mincore_args *);
+int	getgroups (struct getgroups_args *);
+int	setgroups (struct setgroups_args *);
+int	getpgrp (struct getpgrp_args *);
+int	setpgid (struct setpgid_args *);
+int	setitimer (struct setitimer_args *);
+int	swapon (struct swapon_args *);
+int	getitimer (struct getitimer_args *);
+int	getdtablesize (struct getdtablesize_args *);
+int	dup2 (struct dup2_args *);
+int	fcntl (struct fcntl_args *);
+int	select (struct select_args *);
+int	fsync (struct fsync_args *);
+int	setpriority (struct setpriority_args *);
+int	socket (struct socket_args *);
+int	connect (struct connect_args *);
+int	getpriority (struct getpriority_args *);
+int	bind (struct bind_args *);
+int	setsockopt (struct setsockopt_args *);
+int	listen (struct listen_args *);
+int	gettimeofday (struct gettimeofday_args *);
+int	getrusage (struct getrusage_args *);
+int	getsockopt (struct getsockopt_args *);
+int	readv (struct readv_args *);
+int	writev (struct writev_args *);
+int	settimeofday (struct settimeofday_args *);
+int	fchown (struct fchown_args *);
+int	fchmod (struct fchmod_args *);
+int	setreuid (struct setreuid_args *);
+int	setregid (struct setregid_args *);
+int	rename (struct rename_args *);
+int	flock (struct flock_args *);
+int	mkfifo (struct mkfifo_args *);
+int	sendto (struct sendto_args *);
+int	shutdown (struct shutdown_args *);
+int	socketpair (struct socketpair_args *);
+int	mkdir (struct mkdir_args *);
+int	rmdir (struct rmdir_args *);
+int	utimes (struct utimes_args *);
+int	adjtime (struct adjtime_args *);
+int	setsid (struct setsid_args *);
+int	quotactl (struct quotactl_args *);
+int	nfssvc (struct nfssvc_args *);
+int	statfs (struct statfs_args *);
+int	fstatfs (struct fstatfs_args *);
+int	getfh (struct getfh_args *);
+int	getdomainname (struct getdomainname_args *);
+int	setdomainname (struct setdomainname_args *);
+int	uname (struct uname_args *);
+int	sysarch (struct sysarch_args *);
+int	rtprio (struct rtprio_args *);
+int	semsys (struct semsys_args *);
+int	msgsys (struct msgsys_args *);
+int	shmsys (struct shmsys_args *);
+int	pread (struct pread_args *);
+int	pwrite (struct pwrite_args *);
+int	ntp_adjtime (struct ntp_adjtime_args *);
+int	setgid (struct setgid_args *);
+int	setegid (struct setegid_args *);
+int	seteuid (struct seteuid_args *);
+int	stat (struct stat_args *);
+int	fstat (struct fstat_args *);
+int	lstat (struct lstat_args *);
+int	pathconf (struct pathconf_args *);
+int	fpathconf (struct fpathconf_args *);
+int	getrlimit (struct __getrlimit_args *);
+int	setrlimit (struct __setrlimit_args *);
+int	getdirentries (struct getdirentries_args *);
+int	mmap (struct mmap_args *);
+int	lseek (struct lseek_args *);
+int	truncate (struct truncate_args *);
+int	ftruncate (struct ftruncate_args *);
+int	__sysctl (struct sysctl_args *);
+int	mlock (struct mlock_args *);
+int	munlock (struct munlock_args *);
+int	undelete (struct undelete_args *);
+int	futimes (struct futimes_args *);
+int	getpgid (struct getpgid_args *);
+int	poll (struct poll_args *);
+int	lkmnosys (struct nosys_args *);
+int	__semctl (struct __semctl_args *);
+int	semget (struct semget_args *);
+int	semop (struct semop_args *);
+int	msgctl (struct msgctl_args *);
+int	msgget (struct msgget_args *);
+int	msgsnd (struct msgsnd_args *);
+int	msgrcv (struct msgrcv_args *);
+int	shmat (struct shmat_args *);
+int	shmctl (struct shmctl_args *);
+int	shmdt (struct shmdt_args *);
+int	shmget (struct shmget_args *);
+int	clock_gettime (struct clock_gettime_args *);
+int	clock_settime (struct clock_settime_args *);
+int	clock_getres (struct clock_getres_args *);
+int	nanosleep (struct nanosleep_args *);
+int	minherit (struct minherit_args *);
+int	rfork (struct rfork_args *);
+int	openbsd_poll (struct openbsd_poll_args *);
+int	issetugid (struct issetugid_args *);
+int	lchown (struct lchown_args *);
+int	getdents (struct getdents_args *);
+int	lchmod (struct lchmod_args *);
+int	lutimes (struct lutimes_args *);
+int	nstat (struct nstat_args *);
+int	nfstat (struct nfstat_args *);
+int	nlstat (struct nlstat_args *);
+int	fhstatfs (struct fhstatfs_args *);
+int	fhopen (struct fhopen_args *);
+int	fhstat (struct fhstat_args *);
+int	modnext (struct modnext_args *);
+int	modstat (struct modstat_args *);
+int	modfnext (struct modfnext_args *);
+int	modfind (struct modfind_args *);
+int	kldload (struct kldload_args *);
+int	kldunload (struct kldunload_args *);
+int	kldfind (struct kldfind_args *);
+int	kldnext (struct kldnext_args *);
+int	kldstat (struct kldstat_args *);
+int	kldfirstmod (struct kldfirstmod_args *);
+int	getsid (struct getsid_args *);
+int	setresuid (struct setresuid_args *);
+int	setresgid (struct setresgid_args *);
+int	aio_return (struct aio_return_args *);
+int	aio_suspend (struct aio_suspend_args *);
+int	aio_cancel (struct aio_cancel_args *);
+int	aio_error (struct aio_error_args *);
+int	aio_read (struct aio_read_args *);
+int	aio_write (struct aio_write_args *);
+int	lio_listio (struct lio_listio_args *);
+int	yield (struct yield_args *);
+int	thr_sleep (struct thr_sleep_args *);
+int	thr_wakeup (struct thr_wakeup_args *);
+int	mlockall (struct mlockall_args *);
+int	munlockall (struct munlockall_args *);
+int	__getcwd (struct __getcwd_args *);
+int	sched_setparam (struct sched_setparam_args *);
+int	sched_getparam (struct sched_getparam_args *);
+int	sched_setscheduler (struct sched_setscheduler_args *);
+int	sched_getscheduler (struct sched_getscheduler_args *);
+int	sched_yield (struct sched_yield_args *);
+int	sched_get_priority_max (struct sched_get_priority_max_args *);
+int	sched_get_priority_min (struct sched_get_priority_min_args *);
+int	sched_rr_get_interval (struct sched_rr_get_interval_args *);
+int	utrace (struct utrace_args *);
+int	kldsym (struct kldsym_args *);
+int	jail (struct jail_args *);
+int	sigprocmask (struct sigprocmask_args *);
+int	sigsuspend (struct sigsuspend_args *);
+int	sigaction (struct sigaction_args *);
+int	sigpending (struct sigpending_args *);
+int	sigreturn (struct sigreturn_args *);
+int	__acl_get_file (struct __acl_get_file_args *);
+int	__acl_set_file (struct __acl_set_file_args *);
+int	__acl_get_fd (struct __acl_get_fd_args *);
+int	__acl_set_fd (struct __acl_set_fd_args *);
+int	__acl_delete_file (struct __acl_delete_file_args *);
+int	__acl_delete_fd (struct __acl_delete_fd_args *);
+int	__acl_aclcheck_file (struct __acl_aclcheck_file_args *);
+int	__acl_aclcheck_fd (struct __acl_aclcheck_fd_args *);
+int	extattrctl (struct extattrctl_args *);
+int	extattr_set_file (struct extattr_set_file_args *);
+int	extattr_get_file (struct extattr_get_file_args *);
+int	extattr_delete_file (struct extattr_delete_file_args *);
+int	aio_waitcomplete (struct aio_waitcomplete_args *);
+int	getresuid (struct getresuid_args *);
+int	getresgid (struct getresgid_args *);
+int	kqueue (struct kqueue_args *);
+int	kevent (struct kevent_args *);
+int	sendfile (struct sendfile_args *);
 
 #endif /* _KERNEL */
 
@@ -2463,44 +2463,44 @@ struct	osendfile_args {
 
 #ifdef _KERNEL
 
-int	ocreat __P((struct ocreat_args *));
-int	olseek __P((struct olseek_args *));
-int	ostat __P((struct ostat_args *));
-int	olstat __P((struct olstat_args *));
-int	osigaction __P((struct osigaction_args *));
-int	osigprocmask __P((struct osigprocmask_args *));
-int	osigpending __P((struct osigpending_args *));
-int	ofstat __P((struct ofstat_args *));
-int	ogetkerninfo __P((struct getkerninfo_args *));
-int	ogetpagesize __P((struct getpagesize_args *));
-int	ommap __P((struct ommap_args *));
-int	owait __P((struct owait_args *));
-int	ogethostname __P((struct gethostname_args *));
-int	osethostname __P((struct sethostname_args *));
-int	oaccept __P((struct accept_args *));
-int	osend __P((struct osend_args *));
-int	orecv __P((struct orecv_args *));
-int	osigreturn __P((struct osigreturn_args *));
-int	osigvec __P((struct osigvec_args *));
-int	osigblock __P((struct osigblock_args *));
-int	osigsetmask __P((struct osigsetmask_args *));
-int	osigsuspend __P((struct osigsuspend_args *));
-int	osigstack __P((struct osigstack_args *));
-int	orecvmsg __P((struct orecvmsg_args *));
-int	osendmsg __P((struct osendmsg_args *));
-int	orecvfrom __P((struct recvfrom_args *));
-int	otruncate __P((struct otruncate_args *));
-int	oftruncate __P((struct oftruncate_args *));
-int	ogetpeername __P((struct ogetpeername_args *));
-int	ogethostid __P((struct ogethostid_args *));
-int	osethostid __P((struct osethostid_args *));
-int	ogetrlimit __P((struct ogetrlimit_args *));
-int	osetrlimit __P((struct osetrlimit_args *));
-int	okillpg __P((struct okillpg_args *));
-int	oquota __P((struct oquota_args *));
-int	ogetsockname __P((struct getsockname_args *));
-int	ogetdirentries __P((struct ogetdirentries_args *));
-int	osendfile __P((struct osendfile_args *));
+int	ocreat (struct ocreat_args *);
+int	olseek (struct olseek_args *);
+int	ostat (struct ostat_args *);
+int	olstat (struct olstat_args *);
+int	osigaction (struct osigaction_args *);
+int	osigprocmask (struct osigprocmask_args *);
+int	osigpending (struct osigpending_args *);
+int	ofstat (struct ofstat_args *);
+int	ogetkerninfo (struct getkerninfo_args *);
+int	ogetpagesize (struct getpagesize_args *);
+int	ommap (struct ommap_args *);
+int	owait (struct owait_args *);
+int	ogethostname (struct gethostname_args *);
+int	osethostname (struct sethostname_args *);
+int	oaccept (struct accept_args *);
+int	osend (struct osend_args *);
+int	orecv (struct orecv_args *);
+int	osigreturn (struct osigreturn_args *);
+int	osigvec (struct osigvec_args *);
+int	osigblock (struct osigblock_args *);
+int	osigsetmask (struct osigsetmask_args *);
+int	osigsuspend (struct osigsuspend_args *);
+int	osigstack (struct osigstack_args *);
+int	orecvmsg (struct orecvmsg_args *);
+int	osendmsg (struct osendmsg_args *);
+int	orecvfrom (struct recvfrom_args *);
+int	otruncate (struct otruncate_args *);
+int	oftruncate (struct oftruncate_args *);
+int	ogetpeername (struct ogetpeername_args *);
+int	ogethostid (struct ogethostid_args *);
+int	osethostid (struct osethostid_args *);
+int	ogetrlimit (struct ogetrlimit_args *);
+int	osetrlimit (struct osetrlimit_args *);
+int	okillpg (struct okillpg_args *);
+int	oquota (struct oquota_args *);
+int	ogetsockname (struct getsockname_args *);
+int	ogetdirentries (struct ogetdirentries_args *);
+int	osendfile (struct osendfile_args *);
 
 #endif /* _KERNEL */
 
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 86a388f345..bb677e7d22 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -37,7 +37,7 @@
  *
  *	@(#)systm.h	8.7 (Berkeley) 3/29/95
  * $FreeBSD: src/sys/sys/systm.h,v 1.111.2.18 2002/12/17 18:04:02 sam Exp $
- * $DragonFly: src/sys/sys/systm.h,v 1.12 2003/08/03 11:51:25 hmp Exp $
+ * $DragonFly: src/sys/sys/systm.h,v 1.13 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_SYSTM_H_
@@ -108,124 +108,124 @@ struct uio;
 struct globaldata;
 struct thread;
 
-void	Debugger __P((const char *msg));
+void	Debugger (const char *msg);
 void	backtrace(void);
-void	mi_gdinit __P((struct globaldata *gd, int cpu));
-int	dumpstatus __P((vm_offset_t addr, off_t count));
-int	nullop __P((void));
-int	eopnotsupp __P((void));
-int	einval __P((void));
-int	seltrue __P((dev_t dev, int which, struct thread *td));
-int	ureadc __P((int, struct uio *));
-void	*hashinit __P((int count, struct malloc_type *type, u_long *hashmask));
-void	*phashinit __P((int count, struct malloc_type *type, u_long *nentries));
-
-void	cpu_boot __P((int));
-void	cpu_rootconf __P((void));
+void	mi_gdinit (struct globaldata *gd, int cpu);
+int	dumpstatus (vm_offset_t addr, off_t count);
+int	nullop (void);
+int	eopnotsupp (void);
+int	einval (void);
+int	seltrue (dev_t dev, int which, struct thread *td);
+int	ureadc (int, struct uio *);
+void	*hashinit (int count, struct malloc_type *type, u_long *hashmask);
+void	*phashinit (int count, struct malloc_type *type, u_long *nentries);
+
+void	cpu_boot (int);
+void	cpu_rootconf (void);
 extern uint32_t crc32_tab[];
 uint32_t crc32(const void *buf, size_t size);
-void	init_param1 __P((void));
-void	init_param2 __P((int physpages));
-void	tablefull __P((const char *));
-int	addlog __P((const char *, ...)) __printflike(1, 2);
-int	kvprintf __P((char const *, void (*)(int, void*), void *, int,
-		      _BSD_VA_LIST_)) __printflike(1, 0);
-int	log __P((int, const char *, ...)) __printflike(2, 3);
-void	logwakeup __P((void));
-void	log_console __P((struct uio *));
-int	printf __P((const char *, ...)) __printflike(1, 2);
-int	snprintf __P((char *, size_t, const char *, ...)) __printflike(3, 4);
-int	sprintf __P((char *buf, const char *, ...)) __printflike(2, 3);
-int	uprintf __P((const char *, ...)) __printflike(1, 2);
-int	vprintf __P((const char *, _BSD_VA_LIST_)) __printflike(1, 0);
-int	vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_)) __printflike(3, 0);
-int     vsprintf __P((char *buf, const char *, _BSD_VA_LIST_)) __printflike(2, 0);
-int	ttyprintf __P((struct tty *, const char *, ...)) __printflike(2, 3);
-int	sscanf __P((const char *, char const *, ...));
-int	vsscanf __P((const char *, char const *, _BSD_VA_LIST_));
-long	strtol __P((const char *, char **, int));
-u_long	strtoul __P((const char *, char **, int));
-quad_t	strtoq __P((const char *, char **, int));
-u_quad_t strtouq __P((const char *, char **, int));
+void	init_param1 (void);
+void	init_param2 (int physpages);
+void	tablefull (const char *);
+int	addlog (const char *, ...) __printflike(1, 2);
+int	kvprintf (char const *, void (*)(int, void*), void *, int,
+		      _BSD_VA_LIST_) __printflike(1, 0);
+int	log (int, const char *, ...) __printflike(2, 3);
+void	logwakeup (void);
+void	log_console (struct uio *);
+int	printf (const char *, ...) __printflike(1, 2);
+int	snprintf (char *, size_t, const char *, ...) __printflike(3, 4);
+int	sprintf (char *buf, const char *, ...) __printflike(2, 3);
+int	uprintf (const char *, ...) __printflike(1, 2);
+int	vprintf (const char *, _BSD_VA_LIST_) __printflike(1, 0);
+int	vsnprintf (char *, size_t, const char *, _BSD_VA_LIST_) __printflike(3, 0);
+int     vsprintf (char *buf, const char *, _BSD_VA_LIST_) __printflike(2, 0);
+int	ttyprintf (struct tty *, const char *, ...) __printflike(2, 3);
+int	sscanf (const char *, char const *, ...);
+int	vsscanf (const char *, char const *, _BSD_VA_LIST_);
+long	strtol (const char *, char **, int);
+u_long	strtoul (const char *, char **, int);
+quad_t	strtoq (const char *, char **, int);
+u_quad_t strtouq (const char *, char **, int);
 
 /*
  * note: some functions commonly used by device drivers may be passed
  * pointers to volatile storage, volatile set to avoid warnings.
  */
-void	bcopy __P((volatile const void *from, volatile void *to, size_t len));
-void	ovbcopy __P((const void *from, void *to, size_t len));
+void	bcopy (volatile const void *from, volatile void *to, size_t len);
+void	ovbcopy (const void *from, void *to, size_t len);
 
 #ifdef __i386__
-extern void	(*bzero) __P((volatile void *buf, size_t len));
+extern void	(*bzero) (volatile void *buf, size_t len);
 #else
-void	bzero __P((void *buf, size_t len));
+void	bzero (void *buf, size_t len);
 #endif
 
-void	*memcpy __P((void *to, const void *from, size_t len));
+void	*memcpy (void *to, const void *from, size_t len);
 
-int	copystr __P((const void *kfaddr, void *kdaddr, size_t len,
-		size_t *lencopied));
-int	copyinstr __P((const void *udaddr, void *kaddr, size_t len,
-		size_t *lencopied));
-int	copyin __P((const void *udaddr, void *kaddr, size_t len));
-int	copyout __P((const void *kaddr, void *udaddr, size_t len));
+int	copystr (const void *kfaddr, void *kdaddr, size_t len,
+		size_t *lencopied);
+int	copyinstr (const void *udaddr, void *kaddr, size_t len,
+		size_t *lencopied);
+int	copyin (const void *udaddr, void *kaddr, size_t len);
+int	copyout (const void *kaddr, void *udaddr, size_t len);
 
-int	fubyte __P((const void *base));
-int	subyte __P((void *base, int byte));
-int	suibyte __P((void *base, int byte));
-long	fuword __P((const void *base));
-int	suword __P((void *base, long word));
-int	fusword __P((void *base));
-int	susword __P((void *base, int word));
+int	fubyte (const void *base);
+int	subyte (void *base, int byte);
+int	suibyte (void *base, int byte);
+long	fuword (const void *base);
+int	suword (void *base, long word);
+int	fusword (void *base);
+int	susword (void *base, int word);
 
-void	realitexpire __P((void *));
+void	realitexpire (void *);
 void	DELAY(int usec);
-void	hardclock __P((struct clockframe *frame));
-void	statclock __P((struct clockframe *frame));
+void	hardclock (struct clockframe *frame);
+void	statclock (struct clockframe *frame);
 
-void	startprofclock __P((struct proc *));
-void	stopprofclock __P((struct proc *));
-void	setstatclockrate __P((int hzrate));
+void	startprofclock (struct proc *);
+void	stopprofclock (struct proc *);
+void	setstatclockrate (int hzrate);
 
-char	*getenv __P((const char *name));
+char	*getenv (const char *name);
 #define	testenv	getenv
 #define	freeenv
-int	getenv_int __P((const char *name, int *data));
-int	getenv_string __P((const char *name, char *data, int size));
-int	getenv_quad __P((const char *name, quad_t *data));
+int	getenv_int (const char *name, int *data);
+int	getenv_string (const char *name, char *data, int size);
+int	getenv_quad (const char *name, quad_t *data);
 extern char *kern_envp;
 
 #ifdef APM_FIXUP_CALLTODO 
-void	adjust_timeout_calltodo __P((struct timeval *time_change)); 
+void	adjust_timeout_calltodo (struct timeval *time_change); 
 #endif /* APM_FIXUP_CALLTODO */ 
 
 #include <sys/libkern.h>
 
 /* Initialize the world */
-void	consinit __P((void));
-void	cpu_initclocks __P((void));
-void	nchinit __P((void));
-void	usrinfoinit __P((void));
-void	vntblinit __P((void));
+void	consinit (void);
+void	cpu_initclocks (void);
+void	nchinit (void);
+void	usrinfoinit (void);
+void	vntblinit (void);
 
 /* Finalize the world. */
-void	shutdown_nice __P((int));
+void	shutdown_nice (int);
 
 /*
  * Kernel to clock driver interface.
  */
-void	inittodr __P((time_t base));
-void	resettodr __P((void));
-void	startrtclock __P((void));
+void	inittodr (time_t base);
+void	resettodr (void);
+void	startrtclock (void);
 
 /* Timeouts */
-typedef void timeout_t __P((void *));	/* timeout function type */
+typedef void timeout_t (void *);	/* timeout function type */
 #define CALLOUT_HANDLE_INITIALIZER(handle)	\
 	{ NULL }
 
-void	callout_handle_init __P((struct callout_handle *));
-struct	callout_handle timeout __P((timeout_t *, void *, int));
-void	untimeout __P((timeout_t *, void *, struct callout_handle));
+void	callout_handle_init (struct callout_handle *);
+struct	callout_handle timeout (timeout_t *, void *, int);
+void	untimeout (timeout_t *, void *, struct callout_handle);
 
 /* Interrupt management */
 
@@ -234,43 +234,43 @@ void	untimeout __P((timeout_t *, void *, struct callout_handle));
  * the others should be.
  */
 #ifdef __i386__
-void		setdelayed __P((void));
-void		setsoftast __P((void));
-void		setsoftcambio __P((void));
-void		setsoftcamnet __P((void));
-void		setsoftclock __P((void));
-void		setsoftcrypto __P((void));
-void		setsoftnet __P((void));
-void		setsofttty __P((void));
-void		setsoftvm __P((void));
-void		setsofttq __P((void));
-void		schedsoftcamnet __P((void));
-void		schedsoftcambio __P((void));
-void		schedsoftnet __P((void));
-void		schedsofttty __P((void));
-void		schedsoftvm __P((void));
-void		schedsofttq __P((void));
-intrmask_t	softclockpending __P((void));
-void		spl0 __P((void));
-intrmask_t	splbio __P((void));
-intrmask_t	splcam __P((void));
-intrmask_t	splclock __P((void));
-intrmask_t	splcrypto __P((void));
-intrmask_t	splhigh __P((void));
-intrmask_t	splimp __P((void));
-intrmask_t	splnet __P((void));
-intrmask_t	splsoftcam __P((void));
-intrmask_t	splsoftcambio __P((void));
-intrmask_t	splsoftcamnet __P((void));
-intrmask_t	splsoftclock __P((void));
-intrmask_t	splsofttty __P((void));
-intrmask_t	splsoftvm __P((void));
-intrmask_t	splsofttq __P((void));
-intrmask_t	splstatclock __P((void));
-intrmask_t	spltty __P((void));
-intrmask_t	splvm __P((void));
-void		splx __P((intrmask_t ipl));
-void		splz __P((void));
+void		setdelayed (void);
+void		setsoftast (void);
+void		setsoftcambio (void);
+void		setsoftcamnet (void);
+void		setsoftclock (void);
+void		setsoftcrypto (void);
+void		setsoftnet (void);
+void		setsofttty (void);
+void		setsoftvm (void);
+void		setsofttq (void);
+void		schedsoftcamnet (void);
+void		schedsoftcambio (void);
+void		schedsoftnet (void);
+void		schedsofttty (void);
+void		schedsoftvm (void);
+void		schedsofttq (void);
+intrmask_t	softclockpending (void);
+void		spl0 (void);
+intrmask_t	splbio (void);
+intrmask_t	splcam (void);
+intrmask_t	splclock (void);
+intrmask_t	splcrypto (void);
+intrmask_t	splhigh (void);
+intrmask_t	splimp (void);
+intrmask_t	splnet (void);
+intrmask_t	splsoftcam (void);
+intrmask_t	splsoftcambio (void);
+intrmask_t	splsoftcamnet (void);
+intrmask_t	splsoftclock (void);
+intrmask_t	splsofttty (void);
+intrmask_t	splsoftvm (void);
+intrmask_t	splsofttq (void);
+intrmask_t	splstatclock (void);
+intrmask_t	spltty (void);
+intrmask_t	splvm (void);
+void		splx (intrmask_t ipl);
+void		splz (void);
 #endif /* __i386__ */
 
 #ifdef __alpha__
@@ -278,23 +278,23 @@ void		splz __P((void));
 #endif
 
 #ifdef INVARIANT_SUPPORT
-void	splbioassert __P((const char *msg));
-void	splcamassert __P((const char *msg));
-void	splclockassert __P((const char *msg));
-void	splcryptoassert __P((const char *msg));
-void	splhighassert __P((const char *msg));
-void	splimpassert __P((const char *msg));
-void	splnetassert __P((const char *msg));
-void	splsoftcamassert __P((const char *msg));
-void	splsoftcambioassert __P((const char *msg));
-void	splsoftcamnetassert __P((const char *msg));
-void	splsoftclockassert __P((const char *msg));
-void	splsoftttyassert __P((const char *msg));
-void	splsoftvmassert __P((const char *msg));
-void	splsofttqassert __P((const char *msg));
-void	splstatclockassert __P((const char *msg));
-void	splttyassert __P((const char *msg));
-void	splvmassert __P((const char *msg));
+void	splbioassert (const char *msg);
+void	splcamassert (const char *msg);
+void	splclockassert (const char *msg);
+void	splcryptoassert (const char *msg);
+void	splhighassert (const char *msg);
+void	splimpassert (const char *msg);
+void	splnetassert (const char *msg);
+void	splsoftcamassert (const char *msg);
+void	splsoftcambioassert (const char *msg);
+void	splsoftcamnetassert (const char *msg);
+void	splsoftclockassert (const char *msg);
+void	splsoftttyassert (const char *msg);
+void	splsoftvmassert (const char *msg);
+void	splsofttqassert (const char *msg);
+void	splstatclockassert (const char *msg);
+void	splttyassert (const char *msg);
+void	splvmassert (const char *msg);
 #endif /* INVARIANT_SUPPORT */
 
 /*
@@ -319,17 +319,17 @@ extern const intrmask_t softtty_imask; /* interrupt masked with splsofttty() */
  */
 
 /* Exit callout list declarations. */
-typedef void (*exitlist_fn) __P((struct thread *td));
+typedef void (*exitlist_fn) (struct thread *td);
 
-int	at_exit __P((exitlist_fn function));
-int	rm_at_exit __P((exitlist_fn function));
+int	at_exit (exitlist_fn function);
+int	rm_at_exit (exitlist_fn function);
 
 /* Fork callout list declarations. */
-typedef void (*forklist_fn) __P((struct proc *parent, struct proc *child,
-				 int flags));
+typedef void (*forklist_fn) (struct proc *parent, struct proc *child,
+				 int flags);
 
-int	at_fork __P((forklist_fn function));
-int	rm_at_fork __P((forklist_fn function));
+int	at_fork (forklist_fn function);
+int	rm_at_fork (forklist_fn function);
 
 /*
  * Not exactly a callout LIST, but a callout entry.
@@ -338,7 +338,7 @@ int	rm_at_fork __P((forklist_fn function));
  * kernel needs to be able to hold off the watchdog, when the process
  * is not active, e.g., when dumping core.
  */
-typedef void (*watchdog_tickle_fn) __P((void));
+typedef void (*watchdog_tickle_fn) (void);
 
 extern watchdog_tickle_fn	wdog_tickler;
 
@@ -346,9 +346,9 @@ extern watchdog_tickle_fn	wdog_tickler;
  * Common `proc' functions are declared here so that proc.h can be included
  * less often.
  */
-int	tsleep __P((void *chan, int slpflags, const char *wmesg, int timo));
-void	wakeup __P((void *chan));
-void	wakeup_one __P((void *chan));
+int	tsleep (void *chan, int slpflags, const char *wmesg, int timo);
+void	wakeup (void *chan);
+void	wakeup_one (void *chan);
 
 /*
  * Common `dev_t' stuff are declared here to avoid #include poisoning
diff --git a/sys/sys/sysunion.h b/sys/sys/sysunion.h
index 03cfeb43d3..3709e14154 100644
--- a/sys/sys/sysunion.h
+++ b/sys/sys/sysunion.h
@@ -2,7 +2,7 @@
  * Union of syscall args for messaging.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $DragonFly: src/sys/sys/sysunion.h,v 1.4 2003/08/12 02:36:15 dillon Exp $
+ * $DragonFly: src/sys/sys/sysunion.h,v 1.5 2003/08/20 07:31:21 rob Exp $
  * created from DragonFly: src/sys/kern/syscalls.master,v 1.2 2003/06/17 04:28:41 dillon Exp 
  */
 
diff --git a/sys/sys/termios.h b/sys/sys/termios.h
index 38d40a2761..538640fa66 100644
--- a/sys/sys/termios.h
+++ b/sys/sys/termios.h
@@ -32,7 +32,7 @@
  *
  *	@(#)termios.h	8.3 (Berkeley) 3/28/94
  * $FreeBSD: src/sys/sys/termios.h,v 1.13.2.1 2001/03/06 06:31:44 jhb Exp $
- * $DragonFly: src/sys/sys/termios.h,v 1.2 2003/06/17 04:28:59 dillon Exp $
+ * $DragonFly: src/sys/sys/termios.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_TERMIOS_H_
@@ -248,20 +248,20 @@ struct termios {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-speed_t	cfgetispeed __P((const struct termios *));
-speed_t	cfgetospeed __P((const struct termios *));
-int	cfsetispeed __P((struct termios *, speed_t));
-int	cfsetospeed __P((struct termios *, speed_t));
-int	tcgetattr __P((int, struct termios *));
-int	tcsetattr __P((int, int, const struct termios *));
-int	tcdrain __P((int));
-int	tcflow __P((int, int));
-int	tcflush __P((int, int));
-int	tcsendbreak __P((int, int));
+speed_t	cfgetispeed (const struct termios *);
+speed_t	cfgetospeed (const struct termios *);
+int	cfsetispeed (struct termios *, speed_t);
+int	cfsetospeed (struct termios *, speed_t);
+int	tcgetattr (int, struct termios *);
+int	tcsetattr (int, int, const struct termios *);
+int	tcdrain (int);
+int	tcflow (int, int);
+int	tcflush (int, int);
+int	tcsendbreak (int, int);
 
 #ifndef _POSIX_SOURCE
-void	cfmakeraw __P((struct termios *));
-int	cfsetspeed __P((struct termios *, speed_t));
+void	cfmakeraw (struct termios *);
+int	cfsetspeed (struct termios *, speed_t);
 #endif /* !_POSIX_SOURCE */
 __END_DECLS
 
diff --git a/sys/sys/thread.h b/sys/sys/thread.h
index 7e463eca2a..ba9cbc9134 100644
--- a/sys/sys/thread.h
+++ b/sys/sys/thread.h
@@ -4,7 +4,7 @@
  *	Implements the architecture independant portion of the LWKT 
  *	subsystem.
  * 
- * $DragonFly: src/sys/sys/thread.h,v 1.28 2003/07/25 05:26:52 dillon Exp $
+ * $DragonFly: src/sys/sys/thread.h,v 1.29 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_THREAD_H_
@@ -264,7 +264,7 @@ extern struct proc *lwkt_preempted_proc(void);
 extern int  lwkt_create (void (*func)(void *), void *arg, struct thread **ptd,
 			    struct thread *template, int tdflags,
 			    const char *ctl, ...);
-extern void lwkt_exit __P((void)) __dead2;
+extern void lwkt_exit (void) __dead2;
 
 #endif
 
diff --git a/sys/sys/time.h b/sys/sys/time.h
index 455f0d07c4..386dc62e60 100644
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -32,7 +32,7 @@
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
  * $FreeBSD: src/sys/sys/time.h,v 1.42 1999/12/29 04:24:48 peter Exp $
- * $DragonFly: src/sys/sys/time.h,v 1.3 2003/07/28 04:29:12 hmp Exp $
+ * $DragonFly: src/sys/sys/time.h,v 1.4 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_TIME_H_
@@ -133,8 +133,8 @@ struct timezone {
  */
 
 struct timecounter;
-typedef unsigned timecounter_get_t __P((struct timecounter *));
-typedef void timecounter_pps_t __P((struct timecounter *));
+typedef unsigned timecounter_get_t (struct timecounter *);
+typedef void timecounter_pps_t (struct timecounter *);
 
 struct timecounter {
 	/* These fields must be initialized by the driver. */
@@ -270,38 +270,38 @@ struct clockinfo {
 extern struct timecounter *timecounter;
 extern time_t	time_second;
 
-void	getmicrouptime __P((struct timeval *tv));
-void	getmicrotime __P((struct timeval *tv));
-void	getnanouptime __P((struct timespec *tv));
-void	getnanotime __P((struct timespec *tv));
-void	init_timecounter __P((struct timecounter *tc));
-int	itimerdecr __P((struct itimerval *itp, int usec));
-int	itimerfix __P((struct timeval *tv));
-int 	ppsratecheck __P((struct timeval *, int *, int usec));
-int 	ratecheck __P((struct timeval *, const struct timeval *));
-void	microuptime __P((struct timeval *tv));
-void	microtime __P((struct timeval *tv));
-void	nanouptime __P((struct timespec *ts));
-void	nanotime __P((struct timespec *ts));
-void	set_timecounter __P((struct timespec *ts));
-void	timevaladd __P((struct timeval *, struct timeval *));
-void	timevalsub __P((struct timeval *, struct timeval *));
-int	tvtohz __P((struct timeval *));
-void	update_timecounter __P((struct timecounter *tc));
+void	getmicrouptime (struct timeval *tv);
+void	getmicrotime (struct timeval *tv);
+void	getnanouptime (struct timespec *tv);
+void	getnanotime (struct timespec *tv);
+void	init_timecounter (struct timecounter *tc);
+int	itimerdecr (struct itimerval *itp, int usec);
+int	itimerfix (struct timeval *tv);
+int 	ppsratecheck (struct timeval *, int *, int usec);
+int 	ratecheck (struct timeval *, const struct timeval *);
+void	microuptime (struct timeval *tv);
+void	microtime (struct timeval *tv);
+void	nanouptime (struct timespec *ts);
+void	nanotime (struct timespec *ts);
+void	set_timecounter (struct timespec *ts);
+void	timevaladd (struct timeval *, struct timeval *);
+void	timevalsub (struct timeval *, struct timeval *);
+int	tvtohz (struct timeval *);
+void	update_timecounter (struct timecounter *tc);
 #else /* !_KERNEL */
 #include <time.h>
 
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	adjtime __P((const struct timeval *, struct timeval *));
-int	futimes __P((int, const struct timeval *));
-int	getitimer __P((int, struct itimerval *));
-int	gettimeofday __P((struct timeval *, struct timezone *));
-int	lutimes __P((const char *, const struct timeval *));
-int	setitimer __P((int, const struct itimerval *, struct itimerval *));
-int	settimeofday __P((const struct timeval *, const struct timezone *));
-int	utimes __P((const char *, const struct timeval *));
+int	adjtime (const struct timeval *, struct timeval *);
+int	futimes (int, const struct timeval *);
+int	getitimer (int, struct itimerval *);
+int	gettimeofday (struct timeval *, struct timezone *);
+int	lutimes (const char *, const struct timeval *);
+int	setitimer (int, const struct itimerval *, struct itimerval *);
+int	settimeofday (const struct timeval *, const struct timezone *);
+int	utimes (const char *, const struct timeval *);
 __END_DECLS
 
 #endif /* !_KERNEL */
diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h
index 6c407701c6..6dec7981c1 100644
--- a/sys/sys/timeb.h
+++ b/sys/sys/timeb.h
@@ -37,7 +37,7 @@
  *
  *	@(#)timeb.h	8.2 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/sys/timeb.h,v 1.6.2.1 2001/12/10 20:33:59 dwmalone Exp $
- * $DragonFly: src/sys/sys/timeb.h,v 1.2 2003/06/17 04:28:59 dillon Exp $
+ * $DragonFly: src/sys/sys/timeb.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_TIMEB_H_
@@ -55,7 +55,7 @@ struct timeb {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int ftime __P((struct timeb *));
+int ftime (struct timeb *);
 __END_DECLS
 #endif /* _KERNEL */
 
diff --git a/sys/sys/timepps.h b/sys/sys/timepps.h
index 9be719e725..c365db9c1c 100644
--- a/sys/sys/timepps.h
+++ b/sys/sys/timepps.h
@@ -7,7 +7,7 @@
  * ----------------------------------------------------------------------------
  *
  * $FreeBSD: src/sys/sys/timepps.h,v 1.12 1999/12/29 04:24:48 peter Exp $
- * $DragonFly: src/sys/sys/timepps.h,v 1.2 2003/06/17 04:28:59 dillon Exp $
+ * $DragonFly: src/sys/sys/timepps.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  *
  * The is a FreeBSD protype version of the "draft-mogul-pps-api-05.txt" 
  * specification for Pulse Per Second timing interfaces.  
@@ -113,10 +113,10 @@ struct pps_state {
 	unsigned	ppscount[3];
 };
 
-void pps_event __P((struct pps_state *pps, struct timecounter *tc, unsigned count, int event));
-void pps_init __P((struct pps_state *pps));
-int pps_ioctl __P((u_long cmd, caddr_t data, struct pps_state *pps));
-void hardpps __P((struct timespec *tsp, long nsec));
+void pps_event (struct pps_state *pps, struct timecounter *tc, unsigned count, int event);
+void pps_init (struct pps_state *pps);
+int pps_ioctl (u_long cmd, caddr_t data, struct pps_state *pps);
+void hardpps (struct timespec *tsp, long nsec);
 
 #else /* !_KERNEL */
 
diff --git a/sys/sys/times.h b/sys/sys/times.h
index dfcacea414..2e0c3f58f1 100644
--- a/sys/sys/times.h
+++ b/sys/sys/times.h
@@ -37,7 +37,7 @@
  *
  *	@(#)times.h	8.4 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/sys/times.h,v 1.6 1999/12/29 04:24:48 peter Exp $
- * $DragonFly: src/sys/sys/times.h,v 1.2 2003/06/17 04:28:59 dillon Exp $
+ * $DragonFly: src/sys/sys/times.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef	_SYS_TIMES_H_
@@ -61,7 +61,7 @@ struct tms {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-clock_t	times __P((struct tms *));
+clock_t	times (struct tms *);
 __END_DECLS
 #endif
 #endif /* !_SYS_TIMES_H_ */
diff --git a/sys/sys/timex.h b/sys/sys/timex.h
index 4e6e075180..07b8a6ad18 100644
--- a/sys/sys/timex.h
+++ b/sys/sys/timex.h
@@ -45,7 +45,7 @@
  *      Created file
  *
  * $FreeBSD: src/sys/sys/timex.h,v 1.12.2.1 2001/04/22 11:19:39 jhay Exp $
- * $DragonFly: src/sys/sys/timex.h,v 1.2 2003/06/17 04:28:59 dillon Exp $
+ * $DragonFly: src/sys/sys/timex.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 /*
  * This header file defines the Network Time Protocol (NTP) interfaces
@@ -222,13 +222,13 @@ struct timex {
 
 #ifdef _KERNEL
 struct timecounter;
-void	ntp_update_second __P((struct timecounter *tc));
+void	ntp_update_second (struct timecounter *tc);
 #else /* !_KERNEL */
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	ntp_adjtime __P((struct timex *));
-int	ntp_gettime __P((struct ntptimeval *));
+int	ntp_adjtime (struct timex *);
+int	ntp_gettime (struct ntptimeval *);
 __END_DECLS
 #endif /* _KERNEL */
 
diff --git a/sys/sys/tprintf.h b/sys/sys/tprintf.h
index effc174433..d9acd55dba 100644
--- a/sys/sys/tprintf.h
+++ b/sys/sys/tprintf.h
@@ -32,7 +32,7 @@
  *
  *	@(#)tprintf.h	8.1 (Berkeley) 6/2/93
  * $FreeBSD: src/sys/sys/tprintf.h,v 1.9 1999/08/28 00:52:06 peter Exp $
- * $DragonFly: src/sys/sys/tprintf.h,v 1.2 2003/06/17 04:28:59 dillon Exp $
+ * $DragonFly: src/sys/sys/tprintf.h,v 1.3 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_TPRINTF_H_
@@ -42,9 +42,9 @@ typedef struct session *tpr_t;
 
 struct proc;
 
-tpr_t	tprintf_open __P((struct proc *));
-void	tprintf_close __P((tpr_t));
+tpr_t	tprintf_open (struct proc *);
+void	tprintf_close (tpr_t);
 
-int	tprintf __P((tpr_t, const char *fmt, ...)) __printflike(2, 3);
+int	tprintf (tpr_t, const char *fmt, ...) __printflike(2, 3);
 
 #endif
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index 0266f2c88d..b2ad72b376 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -37,7 +37,7 @@
  *
  *	@(#)tty.h	8.6 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/sys/tty.h,v 1.53.2.1 2001/02/26 04:23:21 jlemon Exp $
- * $DragonFly: src/sys/sys/tty.h,v 1.4 2003/07/19 21:14:50 dillon Exp $
+ * $DragonFly: src/sys/sys/tty.h,v 1.5 2003/08/20 07:31:21 rob Exp $
  */
 
 #ifndef _SYS_TTY_H_
@@ -87,11 +87,11 @@ struct tty {
 	struct	termios t_termios;	/* Termios state. */
 	struct	winsize t_winsize;	/* Window size. */
 					/* Start output. */
-	void	(*t_oproc) __P((struct tty *));
+	void	(*t_oproc) (struct tty *);
 					/* Stop output. */
-	void	(*t_stop) __P((struct tty *, int));
+	void	(*t_stop) (struct tty *, int);
 					/* Set hardware state. */
-	int	(*t_param) __P((struct tty *, struct termios *));
+	int	(*t_param) (struct tty *, struct termios *);
 	void	*t_sc;			/* XXX: net/if_sl.c:sl_softc. */
 	int	t_column;		/* Tty output column. */
 	int	t_rocount, t_rocol;	/* Tty. */
@@ -224,51 +224,51 @@ MALLOC_DECLARE(M_TTYS);
 #endif
 extern	struct tty *constty;	/* Temporary virtual console. */
 
-int	 b_to_q __P((char *cp, int cc, struct clist *q));
-void	 catq __P((struct clist *from, struct clist *to));
-void	 clist_alloc_cblocks __P((struct clist *q, int ccmax, int ccres));
-void	 clist_free_cblocks __P((struct clist *q));
-int	 getc __P((struct clist *q));
-void	 ndflush __P((struct clist *q, int cc));
-char	*nextc __P((struct clist *q, char *cp, int *c));
-void	 nottystop __P((struct tty *tp, int rw));
-int	 putc __P((int c, struct clist *q));
-int	 q_to_b __P((struct clist *q, char *cp, int cc));
-void	 termioschars __P((struct termios *t));
-int	 tputchar __P((int c, struct tty *tp));
-int	 ttcompat __P((struct tty *tp, u_long com, caddr_t data, int flag));
-int	 ttioctl __P((struct tty *tp, u_long com, void *data, int flag));
-int	 ttread __P((struct tty *tp, struct uio *uio, int flag));
-void	 ttrstrt __P((void *tp));
-int	 ttsetcompat __P((struct tty *tp, u_long *com, caddr_t data,
-	    struct termios *term));
-void	 ttsetwater __P((struct tty *tp));
-int	 ttspeedtab __P((int speed, struct speedtab *table));
-int	 ttstart __P((struct tty *tp));
-void	 ttwakeup __P((struct tty *tp));
-int	 ttwrite __P((struct tty *tp, struct uio *uio, int flag));
-void	 ttwwakeup __P((struct tty *tp));
-void	 ttyblock __P((struct tty *tp));
-void	 ttychars __P((struct tty *tp));
-int	 ttycheckoutq __P((struct tty *tp, int wait));
-int	 ttyclose __P((struct tty *tp));
-void	 ttyflush __P((struct tty *tp, int rw));
-void	 ttyfree __P((struct tty *tp));
-void	 ttyinfo __P((struct tty *tp));
-int	 ttyinput __P((int c, struct tty *tp));
-int	 ttylclose __P((struct tty *tp, int flag));
-struct tty *ttymalloc __P((struct tty *tp));
-int	 ttymodem __P((struct tty *tp, int flag));
-int	 ttyopen __P((dev_t device, struct tty *tp));
-int	 ttypoll __P((dev_t dev, int events, struct thread *td));
-int	 ttykqfilter __P((dev_t dev, struct knote *kn));
-int	 ttyread __P((dev_t dev, struct uio *uio, int flag));
-void	 ttyregister __P((struct tty *tp));
-int	 ttysleep __P((struct tty *tp, void *chan, int slpflags, char *wmesg,
-	    int timeout));
-int	 ttywait __P((struct tty *tp));
-int	 ttywrite __P((dev_t dev, struct uio *uio, int flag));
-int	 unputc __P((struct clist *q));
+int	 b_to_q (char *cp, int cc, struct clist *q);
+void	 catq (struct clist *from, struct clist *to);
+void	 clist_alloc_cblocks (struct clist *q, int ccmax, int ccres);
+void	 clist_free_cblocks (struct clist *q);
+int	 getc (struct clist *q);
+void	 ndflush (struct clist *q, int cc);
+char	*nextc (struct clist *q, char *cp, int *c);
+void	 nottystop (struct tty *tp, int rw);
+int	 putc (int c, struct clist *q);
+int	 q_to_b (struct clist *q, char *cp, int cc);
+void	 termioschars (struct termios *t);
+int	 tputchar (int c, struct tty *tp);
+int	 ttcompat (struct tty *tp, u_long com, caddr_t data, int flag);
+int	 ttioctl (struct tty *tp, u_long com, void *data, int flag);
+int	 ttread (struct tty *tp, struct uio *uio, int flag);
+void	 ttrstrt (void *tp);
+int	 ttsetcompat (struct tty *tp, u_long *com, caddr_t data,
+	    struct termios *term);
+void	 ttsetwater (struct tty *tp);
+int	 ttspeedtab (int speed, struct speedtab *table);
+int	 ttstart (struct tty *tp);
+void	 ttwakeup (struct tty *tp);
+int	 ttwrite (struct tty *tp, struct uio *uio, int flag);
+void	 ttwwakeup (struct tty *tp);
+void	 ttyblock (struct tty *tp);
+void	 ttychars (struct tty *tp);
+int	 ttycheckoutq (struct tty *tp, int wait);
+int	 ttyclose (struct tty *tp);
+void	 ttyflush (struct tty *tp, int rw);
+void	 ttyfree (struct tty *tp);
+void	 ttyinfo (struct tty *tp);
+int	 ttyinput (int c, struct tty *tp);
+int	 ttylclose (struct tty *tp, int flag);
+struct tty *ttymalloc (struct tty *tp);
+int	 ttymodem (struct tty *tp, int flag);
+int	 ttyopen (dev_t device, struct tty *tp);
+int	 ttypoll (dev_t dev, int events, struct thread *td);
+int	 ttykqfilter (dev_t dev, struct knote *kn);
+int	 ttyread (dev_t dev, struct uio *uio, int flag);
+void	 ttyregister (struct tty *tp);
+int	 ttysleep (struct tty *tp, void *chan, int slpflags, char *wmesg,
+	    int timeout);
+int	 ttywait (struct tty *tp);
+int	 ttywrite (dev_t dev, struct uio *uio, int flag);
+int	 unputc (struct clist *q);
 
 #endif /* _KERNEL */
 
diff --git a/sys/sys/types.h b/sys/sys/types.h
index 8e68501823..6c77a7d6eb 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -37,7 +37,7 @@
  *
  *	@(#)types.h	8.6 (Berkeley) 2/19/95
  * $FreeBSD: src/sys/sys/types.h,v 1.40.2.2 2001/04/21 14:53:06 ume Exp $
- * $DragonFly: src/sys/sys/types.h,v 1.3 2003/08/11 06:17:37 asmodai Exp $
+ * $DragonFly: src/sys/sys/types.h,v 1.4 2003/08/20 07:31:22 rob Exp $
  */
 
 #ifndef _SYS_TYPES_H_
@@ -196,19 +196,19 @@ typedef	struct fd_set {
 __BEGIN_DECLS
 #ifndef _FTRUNCATE_DECLARED
 #define	_FTRUNCATE_DECLARED
-int	 ftruncate __P((int, off_t));
+int	 ftruncate (int, off_t);
 #endif
 #ifndef _LSEEK_DECLARED
 #define	_LSEEK_DECLARED
-off_t	 lseek __P((int, off_t, int));
+off_t	 lseek (int, off_t, int);
 #endif
 #ifndef _MMAP_DECLARED
 #define	_MMAP_DECLARED
-void *	 mmap __P((void *, size_t, int, int, int, off_t));
+void *	 mmap (void *, size_t, int, int, int, off_t);
 #endif
 #ifndef _TRUNCATE_DECLARED
 #define	_TRUNCATE_DECLARED
-int	 truncate __P((const char *, off_t));
+int	 truncate (const char *, off_t);
 #endif
 __END_DECLS
 #endif /* !_KERNEL */
diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h
index 82f0af452d..c66f96b7c9 100644
--- a/sys/sys/ucred.h
+++ b/sys/sys/ucred.h
@@ -32,7 +32,7 @@
  *
  *	@(#)ucred.h	8.4 (Berkeley) 1/9/95
  * $FreeBSD: src/sys/sys/ucred.h,v 1.14.2.5 2002/03/09 05:20:25 dd Exp $
- * $DragonFly: src/sys/sys/ucred.h,v 1.5 2003/06/26 02:17:47 dillon Exp $
+ * $DragonFly: src/sys/sys/ucred.h,v 1.6 2003/08/20 07:31:22 rob Exp $
  */
 
 #ifndef _SYS_UCRED_H_
@@ -82,16 +82,16 @@ struct xucred {
 
 struct proc;
 
-void		change_euid __P((uid_t euid));
-void		change_ruid __P((uid_t ruid));
-struct ucred	*cratom __P((struct ucred **pcr));
-struct ucred	*crcopy __P((struct ucred *cr));
-struct ucred	*crdup __P((struct ucred *cr));
-void		crfree __P((struct ucred *cr));
-struct ucred	*crget __P((void));
-struct ucred    *crhold __P((struct ucred *cr));
-void		cru2x __P((struct ucred *cr, struct xucred *xcr));
-int		groupmember __P((gid_t gid, struct ucred *cred));
+void		change_euid (uid_t euid);
+void		change_ruid (uid_t ruid);
+struct ucred	*cratom (struct ucred **pcr);
+struct ucred	*crcopy (struct ucred *cr);
+struct ucred	*crdup (struct ucred *cr);
+void		crfree (struct ucred *cr);
+struct ucred	*crget (void);
+struct ucred    *crhold (struct ucred *cr);
+void		cru2x (struct ucred *cr, struct xucred *xcr);
+int		groupmember (gid_t gid, struct ucred *cred);
 #endif /* _KERNEL */
 
 #endif /* !_SYS_UCRED_H_ */
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
index cc565c6e1c..2f08f039b8 100644
--- a/sys/sys/uio.h
+++ b/sys/sys/uio.h
@@ -32,7 +32,7 @@
  *
  *	@(#)uio.h	8.5 (Berkeley) 2/22/94
  * $FreeBSD: src/sys/sys/uio.h,v 1.11.2.1 2001/09/28 16:58:35 dillon Exp $
- * $DragonFly: src/sys/sys/uio.h,v 1.3 2003/06/25 03:56:10 dillon Exp $
+ * $DragonFly: src/sys/sys/uio.h,v 1.4 2003/08/20 07:31:22 rob Exp $
  */
 
 #ifndef _SYS_UIO_H_
@@ -81,18 +81,18 @@ struct uio {
 
 struct vm_object;
 
-void	uio_yield __P((void));
-int	uiomove __P((caddr_t, int, struct uio *));
-int	uiomoveco __P((caddr_t, int, struct uio *, struct vm_object *));
-int	uioread __P((int, struct uio *, struct vm_object *, int *));
+void	uio_yield (void);
+int	uiomove (caddr_t, int, struct uio *);
+int	uiomoveco (caddr_t, int, struct uio *, struct vm_object *);
+int	uioread (int, struct uio *, struct vm_object *, int *);
 
 #else /* !_KERNEL */
 
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-ssize_t	readv __P((int, const struct iovec *, int));
-ssize_t	writev __P((int, const struct iovec *, int));
+ssize_t	readv (int, const struct iovec *, int);
+ssize_t	writev (int, const struct iovec *, int);
 __END_DECLS
 
 #endif /* _KERNEL */
diff --git a/sys/sys/un.h b/sys/sys/un.h
index 8602241346..dc4e5c7b61 100644
--- a/sys/sys/un.h
+++ b/sys/sys/un.h
@@ -32,7 +32,7 @@
  *
  *	@(#)un.h	8.3 (Berkeley) 2/19/95
  * $FreeBSD: src/sys/sys/un.h,v 1.17.2.1 2002/03/09 05:22:23 dd Exp $
- * $DragonFly: src/sys/sys/un.h,v 1.3 2003/07/21 07:57:52 dillon Exp $
+ * $DragonFly: src/sys/sys/un.h,v 1.4 2003/08/20 07:31:22 rob Exp $
  */
 
 #ifndef _SYS_UN_H_
@@ -55,13 +55,13 @@ struct mbuf;
 struct socket;
 struct sockopt;
 
-int	uipc_usrreq __P((struct socket *so, int req, struct mbuf *m,
-		struct mbuf *nam, struct mbuf *control));
-int	uipc_ctloutput __P((struct socket *so, struct sockopt *sopt));
-int	unp_connect2 __P((struct socket *so, struct socket *so2));
-void	unp_dispose __P((struct mbuf *m));
-int	unp_externalize __P((struct mbuf *rights));
-void	unp_init __P((void));
+int	uipc_usrreq (struct socket *so, int req, struct mbuf *m,
+		struct mbuf *nam, struct mbuf *control);
+int	uipc_ctloutput (struct socket *so, struct sockopt *sopt);
+int	unp_connect2 (struct socket *so, struct socket *so2);
+void	unp_dispose (struct mbuf *m);
+int	unp_externalize (struct mbuf *rights);
+void	unp_init (void);
 extern	struct pr_usrreqs uipc_usrreqs;
 #else /* !_KERNEL */
 
diff --git a/sys/sys/user.h b/sys/sys/user.h
index 200d123b05..436a2395c8 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -32,7 +32,7 @@
  *
  *	@(#)user.h	8.2 (Berkeley) 9/23/93
  * $FreeBSD: src/sys/sys/user.h,v 1.24.2.1 2001/10/11 08:20:18 peter Exp $
- * $DragonFly: src/sys/sys/user.h,v 1.10 2003/07/25 05:26:52 dillon Exp $
+ * $DragonFly: src/sys/sys/user.h,v 1.11 2003/08/20 07:31:22 rob Exp $
  */
 
 #ifndef _SYS_USER_H_
@@ -98,8 +98,8 @@ struct kinfo_proc {
 	} kp_eproc;
 	struct thread kp_thread;		/* thread structure */
 };
-void fill_eproc_td __P((struct thread *, struct eproc *, struct proc *));
-void fill_eproc __P((struct proc *, struct eproc *));
+void fill_eproc_td (struct thread *, struct eproc *, struct proc *);
+void fill_eproc (struct proc *, struct eproc *);
 
 
 /*
diff --git a/sys/sys/utsname.h b/sys/sys/utsname.h
index 6f35f51394..ece3c5c2c9 100644
--- a/sys/sys/utsname.h
+++ b/sys/sys/utsname.h
@@ -35,7 +35,7 @@
  *
  *	@(#)utsname.h	8.1 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/sys/utsname.h,v 1.7 1999/12/29 04:24:49 peter Exp $
- * $DragonFly: src/sys/sys/utsname.h,v 1.2 2003/06/17 04:28:59 dillon Exp $
+ * $DragonFly: src/sys/sys/utsname.h,v 1.3 2003/08/20 07:31:22 rob Exp $
  */
 
 #ifndef	_SYS_UTSNAME_H
@@ -58,7 +58,7 @@ struct utsname {
 #ifndef _KERNEL
 #ifdef __STDC__
 __BEGIN_DECLS
-int	uname __P((struct utsname *));
+int	uname (struct utsname *);
 __END_DECLS
 #else
 extern int uname();
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index f020600ee0..31e101a44a 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -32,7 +32,7 @@
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
  * $FreeBSD: src/sys/sys/vnode.h,v 1.111.2.19 2002/12/29 18:19:53 dillon Exp $
- * $DragonFly: src/sys/sys/vnode.h,v 1.6 2003/07/06 21:23:54 dillon Exp $
+ * $DragonFly: src/sys/sys/vnode.h,v 1.7 2003/08/20 07:31:22 rob Exp $
  */
 
 #ifndef _SYS_VNODE_H_
@@ -75,7 +75,7 @@ enum vtagtype	{
  */
 TAILQ_HEAD(buflists, buf);
 
-typedef	int 	vop_t __P((void *));
+typedef	int 	vop_t (void *);
 struct namecache;
 
 /*
@@ -304,7 +304,7 @@ extern	int vfs_ioopt;
 #define	LEASE_WRITE	0x2		/* Check lease for modifiers */
 
 
-extern void	(*lease_updatetime) __P((int deltat));
+extern void	(*lease_updatetime) (int deltat);
 
 #define VSHOULDFREE(vp)	\
 	(!((vp)->v_flag & (VFREE|VDOOMED)) && \
@@ -553,97 +553,97 @@ struct vattr;
 struct vnode;
 struct vop_bwrite_args;
 
-extern int	(*lease_check_hook) __P((struct vop_lease_args *));
+extern int	(*lease_check_hook) (struct vop_lease_args *);
 
-void	addalias __P((struct vnode *vp, dev_t nvp_rdev));
-void	addaliasu __P((struct vnode *vp, udev_t nvp_rdev));
-int 	bdevvp __P((dev_t dev, struct vnode **vpp));
+void	addalias (struct vnode *vp, dev_t nvp_rdev);
+void	addaliasu (struct vnode *vp, udev_t nvp_rdev);
+int 	bdevvp (dev_t dev, struct vnode **vpp);
 /* cache_* may belong in namei.h. */
-void	cache_enter __P((struct vnode *dvp, struct vnode *vp,
-	    struct componentname *cnp));
-int	cache_lookup __P((struct vnode *dvp, struct vnode **vpp,
-	    struct componentname *cnp));
-void	cache_purge __P((struct vnode *vp));
-void	cache_purgevfs __P((struct mount *mp));
-int	cache_leaf_test __P((struct vnode *vp));
-void	cvtstat __P((struct stat *st, struct ostat *ost));
-void	cvtnstat __P((struct stat *sb, struct nstat *nsb));
-int 	getnewvnode __P((enum vtagtype tag,
-	    struct mount *mp, vop_t **vops, struct vnode **vpp));
-int	lease_check __P((struct vop_lease_args *ap));
-int	spec_vnoperate __P((struct vop_generic_args *));
-int	speedup_syncer __P((void));
-int	textvp_fullpath __P((struct proc *p, char **retbuf, char **retfreebuf));
-void 	vattr_null __P((struct vattr *vap));
-int 	vcount __P((struct vnode *vp));
-void	vdrop __P((struct vnode *));
-int	vfinddev __P((dev_t dev, enum vtype type, struct vnode **vpp));
-void	vfs_add_vnodeops __P((const void *));
-void	vfs_rm_vnodeops __P((const void *));
-int	vflush __P((struct mount *mp, int rootrefs, int flags));
-int 	vget __P((struct vnode *vp, int lockflag, struct thread *td));
-void 	vgone __P((struct vnode *vp));
-void	vgonel __P((struct vnode *vp, struct thread *td));
-void	vhold __P((struct vnode *));
-int	vinvalbuf __P((struct vnode *vp, int save, 
-	    struct thread *td, int slpflag, int slptimeo));
-int	vtruncbuf __P((struct vnode *vp, struct thread *td,
-		off_t length, int blksize));
-void	vprint __P((char *label, struct vnode *vp));
-int	vrecycle __P((struct vnode *vp, struct lwkt_token *inter_lkp,
-	    struct thread *td));
-int 	vn_close __P((struct vnode *vp, int flags, struct thread *td));
-int	vn_isdisk __P((struct vnode *vp, int *errp));
-int	vn_lock __P((struct vnode *vp, int flags, struct thread *td));
+void	cache_enter (struct vnode *dvp, struct vnode *vp,
+	    struct componentname *cnp);
+int	cache_lookup (struct vnode *dvp, struct vnode **vpp,
+	    struct componentname *cnp);
+void	cache_purge (struct vnode *vp);
+void	cache_purgevfs (struct mount *mp);
+int	cache_leaf_test (struct vnode *vp);
+void	cvtstat (struct stat *st, struct ostat *ost);
+void	cvtnstat (struct stat *sb, struct nstat *nsb);
+int 	getnewvnode (enum vtagtype tag,
+	    struct mount *mp, vop_t **vops, struct vnode **vpp);
+int	lease_check (struct vop_lease_args *ap);
+int	spec_vnoperate (struct vop_generic_args *);
+int	speedup_syncer (void);
+int	textvp_fullpath (struct proc *p, char **retbuf, char **retfreebuf);
+void 	vattr_null (struct vattr *vap);
+int 	vcount (struct vnode *vp);
+void	vdrop (struct vnode *);
+int	vfinddev (dev_t dev, enum vtype type, struct vnode **vpp);
+void	vfs_add_vnodeops (const void *);
+void	vfs_rm_vnodeops (const void *);
+int	vflush (struct mount *mp, int rootrefs, int flags);
+int 	vget (struct vnode *vp, int lockflag, struct thread *td);
+void 	vgone (struct vnode *vp);
+void	vgonel (struct vnode *vp, struct thread *td);
+void	vhold (struct vnode *);
+int	vinvalbuf (struct vnode *vp, int save, 
+	    struct thread *td, int slpflag, int slptimeo);
+int	vtruncbuf (struct vnode *vp, struct thread *td,
+		off_t length, int blksize);
+void	vprint (char *label, struct vnode *vp);
+int	vrecycle (struct vnode *vp, struct lwkt_token *inter_lkp,
+	    struct thread *td);
+int 	vn_close (struct vnode *vp, int flags, struct thread *td);
+int	vn_isdisk (struct vnode *vp, int *errp);
+int	vn_lock (struct vnode *vp, int flags, struct thread *td);
 #ifdef	DEBUG_LOCKS
-int	debug_vn_lock __P((struct vnode *vp, int flags, struct thread *td,
-	    const char *filename, int line));
+int	debug_vn_lock (struct vnode *vp, int flags, struct thread *td,
+	    const char *filename, int line);
 #define vn_lock(vp,flags,p) debug_vn_lock(vp,flags,p,__FILE__,__LINE__)
 #endif
-int 	vn_open __P((struct nameidata *ndp, int fmode, int cmode));
-void	vn_pollevent __P((struct vnode *vp, int events));
-void	vn_pollgone __P((struct vnode *vp));
-int	vn_pollrecord __P((struct vnode *vp, struct thread *td, int events));
-int 	vn_rdwr __P((enum uio_rw rw, struct vnode *vp, caddr_t base,
+int 	vn_open (struct nameidata *ndp, int fmode, int cmode);
+void	vn_pollevent (struct vnode *vp, int events);
+void	vn_pollgone (struct vnode *vp);
+int	vn_pollrecord (struct vnode *vp, struct thread *td, int events);
+int 	vn_rdwr (enum uio_rw rw, struct vnode *vp, caddr_t base,
 	    int len, off_t offset, enum uio_seg segflg, int ioflg,
-	    struct ucred *cred, int *aresid, struct thread *td));
-int	vn_rdwr_inchunks __P((enum uio_rw rw, struct vnode *vp, caddr_t base,
+	    struct ucred *cred, int *aresid, struct thread *td);
+int	vn_rdwr_inchunks (enum uio_rw rw, struct vnode *vp, caddr_t base,
 	    int len, off_t offset, enum uio_seg segflg, int ioflg,
-	    struct ucred *cred, int *aresid, struct thread *td));
-int	vn_stat __P((struct vnode *vp, struct stat *sb, struct thread *td));
-dev_t	vn_todev __P((struct vnode *vp));
-int	vfs_cache_lookup __P((struct vop_lookup_args *ap));
-int	vfs_object_create __P((struct vnode *vp, struct thread *td));
-void	vfs_timestamp __P((struct timespec *));
-int 	vn_writechk __P((struct vnode *vp));
-int	vop_stdbwrite __P((struct vop_bwrite_args *ap));
-int	vop_stdislocked __P((struct vop_islocked_args *));
-int	vop_stdlock __P((struct vop_lock_args *));
-int	vop_stdunlock __P((struct vop_unlock_args *));
-int	vop_noislocked __P((struct vop_islocked_args *));
-int	vop_nolock __P((struct vop_lock_args *));
-int	vop_nopoll __P((struct vop_poll_args *));
-int	vop_nounlock __P((struct vop_unlock_args *));
-int	vop_stdpathconf __P((struct vop_pathconf_args *));
-int	vop_stdpoll __P((struct vop_poll_args *));
-int	vop_revoke __P((struct vop_revoke_args *));
-int	vop_sharedlock __P((struct vop_lock_args *));
-int	vop_eopnotsupp __P((struct vop_generic_args *ap));
-int	vop_ebadf __P((struct vop_generic_args *ap));
-int	vop_einval __P((struct vop_generic_args *ap));
-int	vop_enotty __P((struct vop_generic_args *ap));
-int	vop_defaultop __P((struct vop_generic_args *ap));
-int	vop_null __P((struct vop_generic_args *ap));
-int	vop_panic __P((struct vop_generic_args *ap));
-int	vop_stdcreatevobject __P((struct vop_createvobject_args *ap));
-int	vop_stddestroyvobject __P((struct vop_destroyvobject_args *ap));
-int	vop_stdgetvobject __P((struct vop_getvobject_args *ap));
-
-void	vfree __P((struct vnode *vp));
-void 	vput __P((struct vnode *vp));
-void 	vrele __P((struct vnode *vp));
-void	vref __P((struct vnode *vp));
-void	vbusy __P((struct vnode *vp));
+	    struct ucred *cred, int *aresid, struct thread *td);
+int	vn_stat (struct vnode *vp, struct stat *sb, struct thread *td);
+dev_t	vn_todev (struct vnode *vp);
+int	vfs_cache_lookup (struct vop_lookup_args *ap);
+int	vfs_object_create (struct vnode *vp, struct thread *td);
+void	vfs_timestamp (struct timespec *);
+int 	vn_writechk (struct vnode *vp);
+int	vop_stdbwrite (struct vop_bwrite_args *ap);
+int	vop_stdislocked (struct vop_islocked_args *);
+int	vop_stdlock (struct vop_lock_args *);
+int	vop_stdunlock (struct vop_unlock_args *);
+int	vop_noislocked (struct vop_islocked_args *);
+int	vop_nolock (struct vop_lock_args *);
+int	vop_nopoll (struct vop_poll_args *);
+int	vop_nounlock (struct vop_unlock_args *);
+int	vop_stdpathconf (struct vop_pathconf_args *);
+int	vop_stdpoll (struct vop_poll_args *);
+int	vop_revoke (struct vop_revoke_args *);
+int	vop_sharedlock (struct vop_lock_args *);
+int	vop_eopnotsupp (struct vop_generic_args *ap);
+int	vop_ebadf (struct vop_generic_args *ap);
+int	vop_einval (struct vop_generic_args *ap);
+int	vop_enotty (struct vop_generic_args *ap);
+int	vop_defaultop (struct vop_generic_args *ap);
+int	vop_null (struct vop_generic_args *ap);
+int	vop_panic (struct vop_generic_args *ap);
+int	vop_stdcreatevobject (struct vop_createvobject_args *ap);
+int	vop_stddestroyvobject (struct vop_destroyvobject_args *ap);
+int	vop_stdgetvobject (struct vop_getvobject_args *ap);
+
+void	vfree (struct vnode *vp);
+void 	vput (struct vnode *vp);
+void 	vrele (struct vnode *vp);
+void	vref (struct vnode *vp);
+void	vbusy (struct vnode *vp);
 
 extern	vop_t	**default_vnodeop_p;
 extern	vop_t **spec_vnodeop_p;
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index 0cd5684eb4..6370df6e45 100644
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -32,7 +32,7 @@
  *
  *	@(#)wait.h	8.2 (Berkeley) 7/10/94
  * $FreeBSD: src/sys/sys/wait.h,v 1.11 1999/12/29 04:24:50 peter Exp $
- * $DragonFly: src/sys/sys/wait.h,v 1.2 2003/06/17 04:28:59 dillon Exp $
+ * $DragonFly: src/sys/sys/wait.h,v 1.3 2003/08/20 07:31:22 rob Exp $
  */
 
 #ifndef _SYS_WAIT_H_
@@ -152,11 +152,11 @@ union wait {
 __BEGIN_DECLS
 struct rusage;	/* forward declaration */
 
-pid_t	wait __P((int *));
-pid_t	waitpid __P((pid_t, int *, int));
+pid_t	wait (int *);
+pid_t	waitpid (pid_t, int *, int);
 #ifndef _POSIX_SOURCE
-pid_t	wait3 __P((int *, int, struct rusage *));
-pid_t	wait4 __P((pid_t, int *, int, struct rusage *));
+pid_t	wait3 (int *, int, struct rusage *);
+pid_t	wait4 (pid_t, int *, int, struct rusage *);
 #endif
 __END_DECLS
 #endif
-- 
2.41.0