From 402ed7e1da2052b942a477981621b1edbc4a3a22 Mon Sep 17 00:00:00 2001
From: Robert Garrett <rob@dragonflybsd.org>
Date: Tue, 26 Aug 2003 21:09:02 +0000
Subject: [PATCH] __P() removal

---
 sys/kern/imgact_aout.c    |  4 ++--
 sys/kern/imgact_elf.c     | 40 +++++++++++++++++------------------
 sys/kern/imgact_gzip.c    | 10 ++++-----
 sys/kern/inflate.c        | 18 ++++++++--------
 sys/kern/kern_acct.c      |  6 +++---
 sys/kern/kern_clock.c     | 10 ++++-----
 sys/kern/kern_descrip.c   | 22 ++++++++++----------
 sys/kern/kern_exec.c      |  6 +++---
 sys/kern/kern_exit.c      |  4 ++--
 sys/kern/kern_ktrace.c    | 12 +++++------
 sys/kern/kern_lockf.c     | 18 ++++++++--------
 sys/kern/kern_malloc.c    |  4 ++--
 sys/kern/kern_proc.c      |  6 +++---
 sys/kern/kern_resource.c  |  8 +++----
 sys/kern/kern_shutdown.c  | 20 +++++++++---------
 sys/kern/kern_sig.c       | 22 ++++++++++----------
 sys/kern/kern_synch.c     | 16 +++++++-------
 sys/kern/kern_time.c      | 14 ++++++-------
 sys/kern/kern_timeout.c   |  4 ++--
 sys/kern/subr_autoconf.c  |  4 ++--
 sys/kern/subr_diskmbr.c   | 14 ++++++-------
 sys/kern/subr_diskslice.c | 26 +++++++++++------------
 sys/kern/subr_prf.c       | 10 ++++-----
 sys/kern/subr_prof.c      |  4 ++--
 sys/kern/sys_generic.c    | 16 +++++++-------
 sys/kern/sys_pipe.c       | 44 +++++++++++++++++++--------------------
 sys/kern/sysv_ipc.c       |  4 ++--
 sys/kern/sysv_msg.c       |  6 +++---
 sys/kern/sysv_sem.c       | 18 ++++++++--------
 sys/kern/sysv_shm.c       | 20 +++++++++---------
 sys/kern/tty.c            | 30 +++++++++++++-------------
 sys/kern/tty_compat.c     | 10 ++++-----
 sys/kern/tty_pty.c        | 12 +++++------
 sys/kern/tty_subr.c       | 12 +++++------
 sys/kern/tty_tty.c        |  4 ++--
 sys/kern/uipc_domain.c    |  8 +++----
 sys/kern/uipc_mbuf.c      |  8 +++----
 sys/kern/uipc_mbuf2.c     |  4 ++--
 sys/kern/uipc_usrreq.c    | 32 ++++++++++++++--------------
 sys/kern/vfs_bio.c        |  4 ++--
 sys/kern/vfs_cache.c      |  4 ++--
 sys/kern/vfs_cluster.c    |  8 +++----
 sys/kern/vfs_default.c    |  6 +++---
 sys/kern/vfs_subr.c       | 36 ++++++++++++++++----------------
 sys/kern/vfs_syscalls.c   | 20 +++++++++---------
 sys/kern/vfs_vnops.c      | 24 ++++++++++-----------
 sys/kern/vnode_if.pl      |  6 +++---
 47 files changed, 319 insertions(+), 319 deletions(-)

diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index 0b3dbef2d1..9388097637 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/imgact_aout.c,v 1.59.2.5 2001/11/03 01:41:08 ps Exp $
- * $DragonFly: src/sys/kern/imgact_aout.c,v 1.4 2003/06/25 03:55:57 dillon Exp $
+ * $DragonFly: src/sys/kern/imgact_aout.c,v 1.5 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -54,7 +54,7 @@
 #include <vm/vm_object.h>
 #include <sys/user.h>
 
-static int	exec_aout_imgact __P((struct image_params *imgp));
+static int	exec_aout_imgact (struct image_params *imgp);
 
 struct sysentvec aout_sysvec = {
 	SYS_MAXSYSCALL,
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 8e182d639e..bd3d950804 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/imgact_elf.c,v 1.73.2.13 2002/12/28 19:49:41 dillon Exp $
- * $DragonFly: src/sys/kern/imgact_elf.c,v 1.6 2003/08/03 10:07:41 hmp Exp $
+ * $DragonFly: src/sys/kern/imgact_elf.c,v 1.7 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -68,16 +68,16 @@
 __ElfType(Brandinfo);
 __ElfType(Auxargs);
 
-static int elf_check_header __P((const Elf_Ehdr *hdr));
-static int elf_freebsd_fixup __P((register_t **stack_base,
-    struct image_params *imgp));
-static int elf_load_file __P((struct proc *p, const char *file, u_long *addr,
-    u_long *entry));
-static int elf_load_section __P((struct proc *p,
+static int elf_check_header (const Elf_Ehdr *hdr);
+static int elf_freebsd_fixup (register_t **stack_base,
+    struct image_params *imgp);
+static int elf_load_file (struct proc *p, const char *file, u_long *addr,
+    u_long *entry);
+static int elf_load_section (struct proc *p,
     struct vmspace *vmspace, struct vnode *vp,
     vm_offset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz,
-    vm_prot_t prot));
-static int exec_elf_imgact __P((struct image_params *imgp));
+    vm_prot_t prot);
+static int exec_elf_imgact (struct image_params *imgp);
 
 static int elf_trace = 0;
 SYSCTL_INT(_debug, OID_AUTO, elf_trace, CTLFLAG_RW, &elf_trace, 0, "");
@@ -742,7 +742,7 @@ elf_freebsd_fixup(register_t **stack_base, struct image_params *imgp)
  * Code for generating ELF core dumps.
  */
 
-typedef void (*segment_callback) __P((vm_map_entry_t, void *));
+typedef void (*segment_callback) (vm_map_entry_t, void *);
 
 /* Closure for cb_put_phdr(). */
 struct phdr_closure {
@@ -756,16 +756,16 @@ struct sseg_closure {
 	size_t size;		/* Total size of all writable segments. */
 };
 
-static void cb_put_phdr __P((vm_map_entry_t, void *));
-static void cb_size_segment __P((vm_map_entry_t, void *));
-static void each_writable_segment __P((struct proc *, segment_callback,
-    void *));
-static int elf_corehdr __P((struct proc *, struct vnode *, struct ucred *,
-    int, void *, size_t));
-static void elf_puthdr __P((struct proc *, void *, size_t *,
-    const prstatus_t *, const prfpregset_t *, const prpsinfo_t *, int));
-static void elf_putnote __P((void *, size_t *, const char *, int,
-    const void *, size_t));
+static void cb_put_phdr (vm_map_entry_t, void *);
+static void cb_size_segment (vm_map_entry_t, void *);
+static void each_writable_segment (struct proc *, segment_callback,
+    void *);
+static int elf_corehdr (struct proc *, struct vnode *, struct ucred *,
+    int, void *, size_t);
+static void elf_puthdr (struct proc *, void *, size_t *,
+    const prstatus_t *, const prfpregset_t *, const prpsinfo_t *, int);
+static void elf_putnote (void *, size_t *, const char *, int,
+    const void *, size_t);
 
 extern int osreldate;
 
diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c
index d815da4ee3..dd5915579f 100644
--- a/sys/kern/imgact_gzip.c
+++ b/sys/kern/imgact_gzip.c
@@ -7,7 +7,7 @@
  * ----------------------------------------------------------------------------
  *
  * $FreeBSD: src/sys/kern/imgact_gzip.c,v 1.40.2.1 2001/11/03 01:41:08 ps Exp $
- * $DragonFly: src/sys/kern/imgact_gzip.c,v 1.2 2003/06/17 04:28:41 dillon Exp $
+ * $DragonFly: src/sys/kern/imgact_gzip.c,v 1.3 2003/08/26 21:09:02 rob Exp $
  *
  * This module handles execution of a.out files which have been run through
  * "gzip".  This saves diskspace, but wastes cpu-cycles and VM.
@@ -57,10 +57,10 @@ struct imgact_gzip {
 	u_long          virtual_offset, file_offset, file_end, bss_size;
 };
 
-static int exec_gzip_imgact __P((struct image_params *imgp));
-static int NextByte __P((void *vp));
-static int do_aout_hdr __P((struct imgact_gzip *));
-static int Flush __P((void *vp, u_char *, u_long siz));
+static int exec_gzip_imgact (struct image_params *imgp);
+static int NextByte (void *vp);
+static int do_aout_hdr (struct imgact_gzip *);
+static int Flush (void *vp, u_char *, u_long siz);
 
 static int
 exec_gzip_imgact(imgp)
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index 51c6598a33..efb88413c4 100644
--- a/sys/kern/inflate.c
+++ b/sys/kern/inflate.c
@@ -8,7 +8,7 @@
  * ----------------------------------------------------------------------------
  *
  * $FreeBSD: src/sys/kern/inflate.c,v 1.14 1999/12/29 04:54:39 peter Exp $
- * $DragonFly: src/sys/kern/inflate.c,v 1.3 2003/07/26 19:42:11 rob Exp $
+ * $DragonFly: src/sys/kern/inflate.c,v 1.4 2003/08/26 21:09:02 rob Exp $
  *
  *
  */
@@ -275,14 +275,14 @@ struct huft {
 
 
 /* Function prototypes */
-static int huft_build __P((struct inflate *, unsigned *, unsigned, unsigned, const ush *, const ush *, struct huft **, int *));
-static int huft_free __P((struct inflate *, struct huft *));
-static int inflate_codes __P((struct inflate *, struct huft *, struct huft *, int, int));
-static int inflate_stored __P((struct inflate *));
-static int xinflate __P((struct inflate *));
-static int inflate_fixed __P((struct inflate *));
-static int inflate_dynamic __P((struct inflate *));
-static int inflate_block __P((struct inflate *, int *));
+static int huft_build (struct inflate *, unsigned *, unsigned, unsigned, const ush *, const ush *, struct huft **, int *);
+static int huft_free (struct inflate *, struct huft *);
+static int inflate_codes (struct inflate *, struct huft *, struct huft *, int, int);
+static int inflate_stored (struct inflate *);
+static int xinflate (struct inflate *);
+static int inflate_fixed (struct inflate *);
+static int inflate_dynamic (struct inflate *);
+static int inflate_block (struct inflate *, int *);
 
 /* The inflate algorithm uses a sliding 32K byte window on the uncompressed
    stream to find repeated byte strings.  This is implemented here as a
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index 7ac7b2ca61..70068fd9f8 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -38,7 +38,7 @@
  *
  *	@(#)kern_acct.c	8.1 (Berkeley) 6/14/93
  * $FreeBSD: src/sys/kern/kern_acct.c,v 1.23.2.1 2002/07/24 18:33:55 johan Exp $
- * $DragonFly: src/sys/kern/kern_acct.c,v 1.5 2003/06/26 05:55:14 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_acct.c,v 1.6 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -75,8 +75,8 @@
  * The former's operation is described in Leffler, et al., and the latter
  * was provided by UCB with the 4.4BSD-Lite release
  */
-static comp_t	encode_comp_t __P((u_long, u_long));
-static void	acctwatch __P((void *));
+static comp_t	encode_comp_t (u_long, u_long);
+static void	acctwatch (void *);
 
 /*
  * Accounting callout handle used for periodic scheduling of
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 89ec720485..96939ef604 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -38,7 +38,7 @@
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/kern_clock.c,v 1.105.2.10 2002/10/17 13:19:40 maxim Exp $
- * $DragonFly: src/sys/kern/kern_clock.c,v 1.10 2003/07/26 19:42:11 rob Exp $
+ * $DragonFly: src/sys/kern/kern_clock.c,v 1.11 2003/08/26 21:09:02 rob Exp $
  */
 
 #include "opt_ntp.h"
@@ -83,12 +83,12 @@ extern void hardclock_device_poll(void);
 static MALLOC_DEFINE(M_TIMECOUNTER, "timecounter", 
 	"Timecounter stable storage");
 
-static void initclocks __P((void *dummy));
+static void initclocks (void *dummy);
 SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL)
 
-static void tco_forward __P((int force));
-static void tco_setscales __P((struct timecounter *tc));
-static __inline unsigned tco_delta __P((struct timecounter *tc));
+static void tco_forward (int force);
+static void tco_setscales (struct timecounter *tc);
+static __inline unsigned tco_delta (struct timecounter *tc);
 
 /*
  * Some of these don't belong here, but it's easiest to concentrate them.
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index ffc0085988..8ea0b3d858 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -37,7 +37,7 @@
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
  * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.81.2.17 2003/06/06 20:21:32 tegge Exp $
- * $DragonFly: src/sys/kern/kern_descrip.c,v 1.11 2003/07/30 00:19:14 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_descrip.c,v 1.12 2003/08/26 21:09:02 rob Exp $
  */
 
 #include "opt_compat.h"
@@ -94,16 +94,16 @@ static struct cdevsw fildesc_cdevsw = {
 	/* psize */	nopsize
 };
 
-static int do_dup __P((struct filedesc *fdp, int old, int new, register_t *retval, struct proc *p));
-static int badfo_readwrite __P((struct file *fp, struct uio *uio,
-    struct ucred *cred, int flags, struct thread *td));
-static int badfo_ioctl __P((struct file *fp, u_long com, caddr_t data,
-    struct thread *td));
-static int badfo_poll __P((struct file *fp, int events,
-    struct ucred *cred, struct thread *td));
-static int badfo_kqfilter __P((struct file *fp, struct knote *kn));
-static int badfo_stat __P((struct file *fp, struct stat *sb, struct thread *td));
-static int badfo_close __P((struct file *fp, struct thread *td));
+static int do_dup (struct filedesc *fdp, int old, int new, register_t *retval, struct proc *p);
+static int badfo_readwrite (struct file *fp, struct uio *uio,
+    struct ucred *cred, int flags, struct thread *td);
+static int badfo_ioctl (struct file *fp, u_long com, caddr_t data,
+    struct thread *td);
+static int badfo_poll (struct file *fp, int events,
+    struct ucred *cred, struct thread *td);
+static int badfo_kqfilter (struct file *fp, struct knote *kn);
+static int badfo_stat (struct file *fp, struct stat *sb, struct thread *td);
+static int badfo_close (struct file *fp, struct thread *td);
 
 /*
  * Descriptor management.
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index c40451aade..ff1b9e7307 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/kern_exec.c,v 1.107.2.15 2002/07/30 15:40:46 nectar Exp $
- * $DragonFly: src/sys/kern/kern_exec.c,v 1.10 2003/08/20 04:44:54 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_exec.c,v 1.11 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -66,7 +66,7 @@
 
 MALLOC_DEFINE(M_PARGS, "proc-args", "Process arguments");
 
-static register_t *exec_copyout_strings __P((struct image_params *));
+static register_t *exec_copyout_strings (struct image_params *);
 
 /* XXX This should be vm_size_t. */
 static u_long ps_strings = PS_STRINGS;
@@ -102,7 +102,7 @@ execve(struct execve_args *uap)
 	int error, len, i;
 	struct image_params image_params, *imgp;
 	struct vattr attr;
-	int (*img_first) __P((struct image_params *));
+	int (*img_first) (struct image_params *);
 
 	KKASSERT(p);
 	imgp = &image_params;
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 35aa00f254..02ba50786e 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -37,7 +37,7 @@
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
  * $FreeBSD: src/sys/kern/kern_exit.c,v 1.92.2.11 2003/01/13 22:51:16 dillon Exp $
- * $DragonFly: src/sys/kern/kern_exit.c,v 1.22 2003/07/30 00:19:14 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_exit.c,v 1.23 2003/08/26 21:09:02 rob Exp $
  */
 
 #include "opt_compat.h"
@@ -77,7 +77,7 @@ MALLOC_DEFINE(M_ZOMBIE, "zombie", "zombie proc status");
 
 static MALLOC_DEFINE(M_ATEXIT, "atexit", "atexit callback");
 
-static int wait1 __P((struct wait_args *, int));
+static int wait1 (struct wait_args *, int);
 
 /*
  * callout list for things to do at exit time
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 323606588b..3d8d7466b5 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -32,7 +32,7 @@
  *
  *	@(#)kern_ktrace.c	8.2 (Berkeley) 9/23/93
  * $FreeBSD: src/sys/kern/kern_ktrace.c,v 1.35.2.6 2002/07/05 22:36:38 darrenr Exp $
- * $DragonFly: src/sys/kern/kern_ktrace.c,v 1.8 2003/08/03 10:07:41 hmp Exp $
+ * $DragonFly: src/sys/kern/kern_ktrace.c,v 1.9 2003/08/26 21:09:02 rob Exp $
  */
 
 #include "opt_ktrace.h"
@@ -55,11 +55,11 @@
 static MALLOC_DEFINE(M_KTRACE, "KTRACE", "KTRACE");
 
 #ifdef KTRACE
-static struct ktr_header *ktrgetheader __P((int type));
-static void ktrwrite __P((struct vnode *, struct ktr_header *, struct uio *));
-static int ktrcanset __P((struct proc *,struct proc *));
-static int ktrsetchildren __P((struct proc *,struct proc *,int,int,struct vnode *));
-static int ktrops __P((struct proc *,struct proc *,int,int,struct vnode *));
+static struct ktr_header *ktrgetheader (int type);
+static void ktrwrite (struct vnode *, struct ktr_header *, struct uio *);
+static int ktrcanset (struct proc *,struct proc *);
+static int ktrsetchildren (struct proc *,struct proc *,int,int,struct vnode *);
+static int ktrops (struct proc *,struct proc *,int,int,struct vnode *);
 
 
 static struct ktr_header *
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index b4daeab3e3..9b47a80cbd 100644
--- a/sys/kern/kern_lockf.c
+++ b/sys/kern/kern_lockf.c
@@ -35,7 +35,7 @@
  *
  *	@(#)ufs_lockf.c	8.3 (Berkeley) 1/6/94
  * $FreeBSD: src/sys/kern/kern_lockf.c,v 1.25 1999/11/16 16:28:56 phk Exp $
- * $DragonFly: src/sys/kern/kern_lockf.c,v 1.5 2003/08/07 21:17:23 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_lockf.c,v 1.6 2003/08/26 21:09:02 rob Exp $
  */
 
 #include "opt_debug_lockf.h"
@@ -75,15 +75,15 @@ static MALLOC_DEFINE(M_LOCKF, "lockf", "Byte-range locking structures");
 #define NOLOCKF (struct lockf *)0
 #define SELF	0x1
 #define OTHERS	0x2
-static int	 lf_clearlock __P((struct lockf *));
-static int	 lf_findoverlap __P((struct lockf *,
-	    struct lockf *, int, struct lockf ***, struct lockf **));
+static int	 lf_clearlock (struct lockf *);
+static int	 lf_findoverlap (struct lockf *,
+	    struct lockf *, int, struct lockf ***, struct lockf **);
 static struct lockf *
-	 lf_getblock __P((struct lockf *));
-static int	 lf_getlock __P((struct lockf *, struct flock *));
-static int	 lf_setlock __P((struct lockf *));
-static void	 lf_split __P((struct lockf *, struct lockf *));
-static void	 lf_wakelock __P((struct lockf *));
+	 lf_getblock (struct lockf *);
+static int	 lf_getlock (struct lockf *, struct flock *);
+static int	 lf_setlock (struct lockf *);
+static void	 lf_split (struct lockf *, struct lockf *);
+static void	 lf_wakelock (struct lockf *);
 
 /*
  * Advisory record locking support
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 38eb68beec..9925e17481 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -32,7 +32,7 @@
  *
  *	@(#)kern_malloc.c	8.3 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/kern/kern_malloc.c,v 1.64.2.5 2002/03/16 02:19:51 archie Exp $
- * $DragonFly: src/sys/kern/Attic/kern_malloc.c,v 1.10 2003/08/25 19:50:32 dillon Exp $
+ * $DragonFly: src/sys/kern/Attic/kern_malloc.c,v 1.11 2003/08/26 21:09:02 rob Exp $
  */
 
 #include "opt_vm.h"
@@ -75,7 +75,7 @@ MALLOC_DEFINE(M_TEMP, "temp", "misc temporary data buffers");
 MALLOC_DEFINE(M_IP6OPT, "ip6opt", "IPv6 options");
 MALLOC_DEFINE(M_IP6NDP, "ip6ndp", "IPv6 Neighbor Discovery");
 
-static void kmeminit __P((void *));
+static void kmeminit (void *);
 SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_FIRST, kmeminit, NULL)
 
 static MALLOC_DEFINE(M_FREE, "free", "should be on free list");
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 64a7fb39dc..7bff7d8ce0 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -32,7 +32,7 @@
  *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
  * $FreeBSD: src/sys/kern/kern_proc.c,v 1.63.2.9 2003/05/08 07:47:16 kbyanc Exp $
- * $DragonFly: src/sys/kern/kern_proc.c,v 1.11 2003/07/26 19:42:11 rob Exp $
+ * $DragonFly: src/sys/kern/kern_proc.c,v 1.12 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -63,9 +63,9 @@ SYSCTL_INT(_kern, OID_AUTO, ps_showallprocs, CTLFLAG_RW,
 SYSCTL_INT(_kern, OID_AUTO, ps_showallthreads, CTLFLAG_RW,
     &ps_showallthreads, 0, "");
 
-static void pgdelete	__P((struct pgrp *));
+static void pgdelete	(struct pgrp *);
 
-static void	orphanpg __P((struct pgrp *pg));
+static void	orphanpg (struct pgrp *pg);
 
 /*
  * Other process lists
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 6708beaac0..9dfbcf7218 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -37,7 +37,7 @@
  *
  *	@(#)kern_resource.c	8.5 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/kern_resource.c,v 1.55.2.5 2001/11/03 01:41:08 ps Exp $
- * $DragonFly: src/sys/kern/kern_resource.c,v 1.13 2003/08/03 10:07:41 hmp Exp $
+ * $DragonFly: src/sys/kern/kern_resource.c,v 1.14 2003/08/26 21:09:02 rob Exp $
  */
 
 #include "opt_compat.h"
@@ -58,15 +58,15 @@
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 
-static int donice __P((struct proc *chgp, int n));
+static int donice (struct proc *chgp, int n);
 
 static MALLOC_DEFINE(M_UIDINFO, "uidinfo", "uidinfo structures");
 #define	UIHASH(uid)	(&uihashtbl[(uid) & uihash])
 static LIST_HEAD(uihashhead, uidinfo) *uihashtbl;
 static u_long uihash;		/* size of hash table - 1 */
 
-static struct uidinfo	*uicreate __P((uid_t uid));
-static struct uidinfo	*uilookup __P((uid_t uid));
+static struct uidinfo	*uicreate (uid_t uid);
+static struct uidinfo	*uilookup (uid_t uid);
 
 /*
  * Resource controls and accounting.
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 43676139bf..efdfa9510d 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -37,7 +37,7 @@
  *
  *	@(#)kern_shutdown.c	8.3 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.72.2.12 2002/02/21 19:15:10 dillon Exp $
- * $DragonFly: src/sys/kern/kern_shutdown.c,v 1.10 2003/07/26 19:42:11 rob Exp $
+ * $DragonFly: src/sys/kern/kern_shutdown.c,v 1.11 2003/08/26 21:09:02 rob Exp $
  */
 
 #include "opt_ddb.h"
@@ -113,14 +113,14 @@ const char *panicstr;
 
 int dumping;				/* system is dumping */
 
-static void boot __P((int)) __dead2;
-static void dumpsys __P((void));
-static int setdumpdev __P((dev_t dev));
-static void poweroff_wait __P((void *, int));
-static void print_uptime __P((void));
-static void shutdown_halt __P((void *junk, int howto));
-static void shutdown_panic __P((void *junk, int howto));
-static void shutdown_reset __P((void *junk, int howto));
+static void boot (int) __dead2;
+static void dumpsys (void);
+static int setdumpdev (dev_t dev);
+static void poweroff_wait (void *, int);
+static void print_uptime (void);
+static void shutdown_halt (void *junk, int howto);
+static void shutdown_panic (void *junk, int howto);
+static void shutdown_reset (void *junk, int howto);
 
 /* register various local shutdown events */
 static void 
@@ -433,7 +433,7 @@ setdumpdev(dev)
 
 
 /* ARGSUSED */
-static void dump_conf __P((void *dummy));
+static void dump_conf (void *dummy);
 static void
 dump_conf(dummy)
 	void *dummy;
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 59dea006da..b7b0f8c03b 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -37,7 +37,7 @@
  *
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
  * $FreeBSD: src/sys/kern/kern_sig.c,v 1.72.2.17 2003/05/16 16:34:34 obrien Exp $
- * $DragonFly: src/sys/kern/kern_sig.c,v 1.17 2003/08/03 10:07:41 hmp Exp $
+ * $DragonFly: src/sys/kern/kern_sig.c,v 1.18 2003/08/26 21:09:02 rob Exp $
  */
 
 #include "opt_compat.h"
@@ -73,16 +73,16 @@
 
 #define	ONSIG	32		/* NSIG for osig* syscalls.  XXX. */
 
-static int coredump	__P((struct proc *));
-static int do_sigaction	__P((int sig, struct sigaction *act,
-			     struct sigaction *oact, int old));
-static int do_sigprocmask __P((int how, sigset_t *set,
-			       sigset_t *oset, int old));
-static char *expand_name __P((const char *, uid_t, pid_t));
-static int killpg1	__P((int sig, int pgid, int all));
-static int sig_ffs	__P((sigset_t *set));
-static int sigprop	__P((int sig));
-static void stop	__P((struct proc *));
+static int coredump	(struct proc *);
+static int do_sigaction	(int sig, struct sigaction *act,
+			     struct sigaction *oact, int old);
+static int do_sigprocmask (int how, sigset_t *set,
+			       sigset_t *oset, int old);
+static char *expand_name (const char *, uid_t, pid_t);
+static int killpg1	(int sig, int pgid, int all);
+static int sig_ffs	(sigset_t *set);
+static int sigprop	(int sig);
+static void stop	(struct proc *);
 #ifdef SMP
 static void signotify_remote(void *arg);
 #endif
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 1763369a77..2fe766f278 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -37,7 +37,7 @@
  *
  *	@(#)kern_synch.c	8.9 (Berkeley) 5/19/95
  * $FreeBSD: src/sys/kern/kern_synch.c,v 1.87.2.6 2002/10/13 07:29:53 kbyanc Exp $
- * $DragonFly: src/sys/kern/kern_synch.c,v 1.20 2003/08/03 10:07:41 hmp Exp $
+ * $DragonFly: src/sys/kern/kern_synch.c,v 1.21 2003/08/26 21:09:02 rob Exp $
  */
 
 #include "opt_ktrace.h"
@@ -61,7 +61,7 @@
 #include <machine/ipl.h>
 #include <machine/smp.h>
 
-static void sched_setup __P((void *dummy));
+static void sched_setup (void *dummy);
 SYSINIT(sched_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, sched_setup, NULL)
 
 int	hogticks;
@@ -83,12 +83,12 @@ static fixpt_t cexp[3] = {
 	0.9944598480048967 * FSCALE,	/* exp(-1/180) */
 };
 
-static void	endtsleep __P((void *));
-static void	loadav __P((void *arg));
-static void	maybe_resched __P((struct proc *chk));
-static void	roundrobin __P((void *arg));
-static void	schedcpu __P((void *arg));
-static void	updatepri __P((struct proc *p));
+static void	endtsleep (void *);
+static void	loadav (void *arg);
+static void	maybe_resched (struct proc *chk);
+static void	roundrobin (void *arg);
+static void	schedcpu (void *arg);
+static void	updatepri (struct proc *p);
 static void	crit_panicints(void);
 
 static int
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 618f21eb67..34e606d424 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -32,7 +32,7 @@
  *
  *	@(#)kern_time.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/kern/kern_time.c,v 1.68.2.1 2002/10/01 08:00:41 bde Exp $
- * $DragonFly: src/sys/kern/kern_time.c,v 1.9 2003/08/12 02:36:15 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_time.c,v 1.10 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -63,11 +63,11 @@ struct timezone tz;
  * timers when they expire.
  */
 
-static int	nanosleep1 __P((struct timespec *rqt,
-		    struct timespec *rmt));
-static int	settime __P((struct timeval *));
-static void	timevalfix __P((struct timeval *));
-static void	no_lease_updatetime __P((int));
+static int	nanosleep1 (struct timespec *rqt,
+		    struct timespec *rmt);
+static int	settime (struct timeval *);
+static void	timevalfix (struct timeval *);
+static void	no_lease_updatetime (int);
 
 static void 
 no_lease_updatetime(deltat)
@@ -75,7 +75,7 @@ no_lease_updatetime(deltat)
 {
 }
 
-void (*lease_updatetime) __P((int))  = no_lease_updatetime;
+void (*lease_updatetime) (int)  = no_lease_updatetime;
 
 static int
 settime(tv)
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 06e47bb247..30b9da1f68 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -37,7 +37,7 @@
  *
  *	From: @(#)kern_clock.c	8.5 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/kern_timeout.c,v 1.59.2.1 2001/11/13 18:24:52 archie Exp $
- * $DragonFly: src/sys/kern/kern_timeout.c,v 1.5 2003/07/26 19:42:11 rob Exp $
+ * $DragonFly: src/sys/kern/kern_timeout.c,v 1.6 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -231,7 +231,7 @@ void
 callout_reset(c, to_ticks, ftn, arg)
 	struct	callout *c;
 	int	to_ticks;
-	void	(*ftn) __P((void *));
+	void	(*ftn) (void *);
 	void	*arg;
 {
 	int	s;
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index ef9e81f22a..51dedfa56b 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -42,7 +42,7 @@
  *	@(#)subr_autoconf.c	8.1 (Berkeley) 6/10/93
  *
  * $FreeBSD: src/sys/kern/subr_autoconf.c,v 1.14 1999/10/05 21:19:41 n_hibma Exp $
- * $DragonFly: src/sys/kern/subr_autoconf.c,v 1.3 2003/07/19 21:14:38 dillon Exp $
+ * $DragonFly: src/sys/kern/subr_autoconf.c,v 1.4 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -61,7 +61,7 @@ static TAILQ_HEAD(, intr_config_hook) intr_config_hook_list =
 
 
 /* ARGSUSED */
-static void run_interrupt_driven_config_hooks __P((void *dummy));
+static void run_interrupt_driven_config_hooks (void *dummy);
 static void
 run_interrupt_driven_config_hooks(dummy)
 	void *dummy;
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c
index b6142c2a6c..e43942d0a8 100644
--- a/sys/kern/subr_diskmbr.c
+++ b/sys/kern/subr_diskmbr.c
@@ -36,7 +36,7 @@
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
  * $FreeBSD: src/sys/kern/subr_diskmbr.c,v 1.45 2000/01/28 10:22:07 bde Exp $
- * $DragonFly: src/sys/kern/subr_diskmbr.c,v 1.3 2003/07/22 17:03:33 dillon Exp $
+ * $DragonFly: src/sys/kern/subr_diskmbr.c,v 1.4 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -67,17 +67,17 @@ static struct dos_partition historical_bogus_partition_table[NDOSPART] = {
 	{ 0x80, 0, 1, 0, DOSPTYP_386BSD, 255, 255, 255, 0, 50000, },
 };
 
-static int check_part __P((char *sname, struct dos_partition *dp,
+static int check_part (char *sname, struct dos_partition *dp,
 			   u_long offset, int nsectors, int ntracks,
-			   u_long mbr_offset));
-static void mbr_extended __P((dev_t dev, struct disklabel *lp,
+			   u_long mbr_offset);
+static void mbr_extended (dev_t dev, struct disklabel *lp,
 			      struct diskslices *ssp, u_long ext_offset,
 			      u_long ext_size, u_long base_ext_offset,
 			      int nsectors, int ntracks, u_long mbr_offset,
-			      int level));
-static int mbr_setslice __P((char *sname, struct disklabel *lp,
+			      int level);
+static int mbr_setslice (char *sname, struct disklabel *lp,
 			     struct diskslice *sp, struct dos_partition *dp,
-			     u_long br_offset));
+			     u_long br_offset);
 
 static int
 check_part(sname, dp, offset, nsectors, ntracks, mbr_offset )
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 9ac0638408..82430c2cb3 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -44,7 +44,7 @@
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
  * $FreeBSD: src/sys/kern/subr_diskslice.c,v 1.82.2.6 2001/07/24 09:49:41 dd Exp $
- * $DragonFly: src/sys/kern/subr_diskslice.c,v 1.5 2003/08/07 21:17:23 dillon Exp $
+ * $DragonFly: src/sys/kern/subr_diskslice.c,v 1.6 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -68,18 +68,18 @@ typedef	u_char	bool_t;
 
 static volatile bool_t ds_debug;
 
-static struct disklabel *clone_label __P((struct disklabel *lp));
-static void dsiodone __P((struct buf *bp));
-static char *fixlabel __P((char *sname, struct diskslice *sp,
-			   struct disklabel *lp, int writeflag));
-static void free_ds_label __P((struct diskslices *ssp, int slice));
-static void partition_info __P((char *sname, int part, struct partition *pp));
-static void slice_info __P((char *sname, struct diskslice *sp));
-static void set_ds_label __P((struct diskslices *ssp, int slice,
-			      struct disklabel *lp));
-static void set_ds_labeldevs __P((dev_t dev, struct diskslices *ssp));
-static void set_ds_wlabel __P((struct diskslices *ssp, int slice,
-			       int wlabel));
+static struct disklabel *clone_label (struct disklabel *lp);
+static void dsiodone (struct buf *bp);
+static char *fixlabel (char *sname, struct diskslice *sp,
+			   struct disklabel *lp, int writeflag);
+static void free_ds_label (struct diskslices *ssp, int slice);
+static void partition_info (char *sname, int part, struct partition *pp);
+static void slice_info (char *sname, struct diskslice *sp);
+static void set_ds_label (struct diskslices *ssp, int slice,
+			      struct disklabel *lp);
+static void set_ds_labeldevs (dev_t dev, struct diskslices *ssp);
+static void set_ds_wlabel (struct diskslices *ssp, int slice,
+			       int wlabel);
 
 /*
  * Duplicate a label for the whole disk, and initialize defaults in the
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 433ddf3439..87bac74a1e 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -37,7 +37,7 @@
  *
  *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/subr_prf.c,v 1.61.2.5 2002/08/31 18:22:08 dwmalone Exp $
- * $DragonFly: src/sys/kern/subr_prf.c,v 1.5 2003/07/26 19:42:11 rob Exp $
+ * $DragonFly: src/sys/kern/subr_prf.c,v 1.6 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -85,10 +85,10 @@ struct	tty *constty;			/* pointer to console "window" tty */
 static void (*v_putc)(int) = cnputc;	/* routine to putc on virtual console */
 static void  msglogchar(int c, int pri);
 static void  msgaddchar(int c, void *dummy);
-static void  putchar __P((int ch, void *arg));
-static char *ksprintn __P((char *nbuf, u_long num, int base, int *len));
-static char *ksprintqn __P((char *nbuf, u_quad_t num, int base, int *len));
-static void  snprintf_func __P((int ch, void *arg));
+static void  putchar (int ch, void *arg);
+static char *ksprintn (char *nbuf, u_long num, int base, int *len);
+static char *ksprintqn (char *nbuf, u_quad_t num, int base, int *len);
+static void  snprintf_func (int ch, void *arg);
 
 static int consintr = 1;		/* Ok to handle console interrupts? */
 static int msgbufmapped;		/* Set when safe to use msgbuf */
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index b1ec6c4c49..e13697d7fa 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -32,7 +32,7 @@
  *
  *	@(#)subr_prof.c	8.3 (Berkeley) 9/23/93
  * $FreeBSD: src/sys/kern/subr_prof.c,v 1.32.2.2 2000/08/03 00:09:32 ps Exp $
- * $DragonFly: src/sys/kern/subr_prof.c,v 1.6 2003/07/26 19:42:11 rob Exp $
+ * $DragonFly: src/sys/kern/subr_prof.c,v 1.7 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -53,7 +53,7 @@
 
 static MALLOC_DEFINE(M_GPROF, "gprof", "kernel profiling buffer");
 
-static void kmstartup __P((void *));
+static void kmstartup (void *);
 SYSINIT(kmem, SI_SUB_KPROF, SI_ORDER_FIRST, kmstartup, NULL)
 
 struct gmonparam _gmonparam = { GMON_PROF_OFF };
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 2525115d4a..f10b7c7a6e 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -37,7 +37,7 @@
  *
  *	@(#)sys_generic.c	8.5 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/sys_generic.c,v 1.55.2.10 2001/03/17 10:39:32 peter Exp $
- * $DragonFly: src/sys/kern/sys_generic.c,v 1.10 2003/07/30 00:19:14 dillon Exp $
+ * $DragonFly: src/sys/kern/sys_generic.c,v 1.11 2003/08/26 21:09:02 rob Exp $
  */
 
 #include "opt_ktrace.h"
@@ -73,13 +73,13 @@ static MALLOC_DEFINE(M_IOCTLOPS, "ioctlops", "ioctl data buffer");
 static MALLOC_DEFINE(M_SELECT, "select", "select() buffer");
 MALLOC_DEFINE(M_IOV, "iov", "large iov's");
 
-static int	pollscan __P((struct proc *, struct pollfd *, u_int, int *));
-static int	selscan __P((struct proc *, fd_mask **, fd_mask **,
-			int, int *));
-static int	dofileread __P((struct file *, int, void *,
-			size_t, off_t, int, int *));
-static int	dofilewrite __P((struct file *, int,
-			const void *, size_t, off_t, int, int *));
+static int	pollscan (struct proc *, struct pollfd *, u_int, int *);
+static int	selscan (struct proc *, fd_mask **, fd_mask **,
+			int, int *);
+static int	dofileread (struct file *, int, void *,
+			size_t, off_t, int, int *);
+static int	dofilewrite (struct file *, int,
+			const void *, size_t, off_t, int, int *);
 
 struct file*
 holdfp(fdp, fd, flag)
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 9914858828..23a47cd91d 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -17,7 +17,7 @@
  *    are met.
  *
  * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.60.2.13 2002/08/05 15:05:15 des Exp $
- * $DragonFly: src/sys/kern/sys_pipe.c,v 1.8 2003/07/30 00:19:14 dillon Exp $
+ * $DragonFly: src/sys/kern/sys_pipe.c,v 1.9 2003/08/26 21:09:02 rob Exp $
  */
 
 /*
@@ -91,16 +91,16 @@
 /*
  * interfaces to the outside world
  */
-static int pipe_read __P((struct file *fp, struct uio *uio, 
-		struct ucred *cred, int flags, struct thread *td));
-static int pipe_write __P((struct file *fp, struct uio *uio, 
-		struct ucred *cred, int flags, struct thread *td));
-static int pipe_close __P((struct file *fp, struct thread *td));
-static int pipe_poll __P((struct file *fp, int events, struct ucred *cred,
-		struct thread *td));
-static int pipe_kqfilter __P((struct file *fp, struct knote *kn));
-static int pipe_stat __P((struct file *fp, struct stat *sb, struct thread *td));
-static int pipe_ioctl __P((struct file *fp, u_long cmd, caddr_t data, struct thread *td));
+static int pipe_read (struct file *fp, struct uio *uio, 
+		struct ucred *cred, int flags, struct thread *td);
+static int pipe_write (struct file *fp, struct uio *uio, 
+		struct ucred *cred, int flags, struct thread *td);
+static int pipe_close (struct file *fp, struct thread *td);
+static int pipe_poll (struct file *fp, int events, struct ucred *cred,
+		struct thread *td);
+static int pipe_kqfilter (struct file *fp, struct knote *kn);
+static int pipe_stat (struct file *fp, struct stat *sb, struct thread *td);
+static int pipe_ioctl (struct file *fp, u_long cmd, caddr_t data, struct thread *td);
 
 static struct fileops pipeops = {
 	NULL,	/* port */
@@ -148,19 +148,19 @@ static int nbigpipe;
 
 static int amountpipekva;
 
-static void pipeclose __P((struct pipe *cpipe));
-static void pipe_free_kmem __P((struct pipe *cpipe));
-static int pipe_create __P((struct pipe **cpipep));
-static __inline int pipelock __P((struct pipe *cpipe, int catch));
-static __inline void pipeunlock __P((struct pipe *cpipe));
-static __inline void pipeselwakeup __P((struct pipe *cpipe));
+static void pipeclose (struct pipe *cpipe);
+static void pipe_free_kmem (struct pipe *cpipe);
+static int pipe_create (struct pipe **cpipep);
+static __inline int pipelock (struct pipe *cpipe, int catch);
+static __inline void pipeunlock (struct pipe *cpipe);
+static __inline void pipeselwakeup (struct pipe *cpipe);
 #ifndef PIPE_NODIRECT
-static int pipe_build_write_buffer __P((struct pipe *wpipe, struct uio *uio));
-static void pipe_destroy_write_buffer __P((struct pipe *wpipe));
-static int pipe_direct_write __P((struct pipe *wpipe, struct uio *uio));
-static void pipe_clone_write_buffer __P((struct pipe *wpipe));
+static int pipe_build_write_buffer (struct pipe *wpipe, struct uio *uio);
+static void pipe_destroy_write_buffer (struct pipe *wpipe);
+static int pipe_direct_write (struct pipe *wpipe, struct uio *uio);
+static void pipe_clone_write_buffer (struct pipe *wpipe);
 #endif
-static int pipespace __P((struct pipe *cpipe, int size));
+static int pipespace (struct pipe *cpipe, int size);
 
 static vm_zone_t pipe_zone;
 
diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c
index 774b790c7d..db306bf47a 100644
--- a/sys/kern/sysv_ipc.c
+++ b/sys/kern/sysv_ipc.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/kern/sysv_ipc.c,v 1.13.2.2 2000/07/01 14:33:49 bsd Exp $ */
-/* $DragonFly: src/sys/kern/sysv_ipc.c,v 1.6 2003/07/24 20:42:31 dillon Exp $ */
+/* $DragonFly: src/sys/kern/sysv_ipc.c,v 1.7 2003/08/26 21:09:02 rob Exp $ */
 /*	$NetBSD: sysv_ipc.c,v 1.7 1994/06/29 06:33:11 cgd Exp $	*/
 
 /*
@@ -80,7 +80,7 @@ ipcperm(struct proc *p, struct ipc_perm *perm, int mode)
 #include <sys/sysproto.h>
 #include <sys/systm.h>
 
-static void sysv_nosys __P((char *s));
+static void sysv_nosys (char *s);
 
 static void 
 sysv_nosys(char *s)
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 314f2db7fe..328bd1221f 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/kern/sysv_msg.c,v 1.23.2.5 2002/12/31 08:54:53 maxim Exp $ */
-/* $DragonFly: src/sys/kern/sysv_msg.c,v 1.11 2003/08/03 17:11:36 dillon Exp $ */
+/* $DragonFly: src/sys/kern/sysv_msg.c,v 1.12 2003/08/26 21:09:02 rob Exp $ */
 
 /*
  * Implementation of SVID messages
@@ -35,12 +35,12 @@
 
 static MALLOC_DEFINE(M_MSG, "msg", "SVID compatible message queues");
 
-static void msginit __P((void *));
+static void msginit (void *);
 
 #define MSG_DEBUG
 #undef MSG_DEBUG_OK
 
-static void msg_freehdr __P((struct msg *msghdr));
+static void msg_freehdr (struct msg *msghdr);
 
 /* XXX casting to (sy_call_t *) is bogus, as usual. */
 static sy_call_t *msgcalls[] = {
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index 3483cf7933..44f320940b 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/kern/sysv_sem.c,v 1.24.2.8 2002/10/22 20:45:03 fjoe Exp $ */
-/* $DragonFly: src/sys/kern/sysv_sem.c,v 1.11 2003/08/03 17:11:36 dillon Exp $ */
+/* $DragonFly: src/sys/kern/sysv_sem.c,v 1.12 2003/08/26 21:09:02 rob Exp $ */
 
 /*
  * Implementation of SVID semaphores
@@ -24,21 +24,21 @@
 
 static MALLOC_DEFINE(M_SEM, "sem", "SVID compatible semaphores");
 
-static void seminit __P((void *));
+static void seminit (void *);
 
 #ifndef _SYS_SYSPROTO_H_
 struct __semctl_args;
-int __semctl __P((struct proc *p, struct __semctl_args *uap));
+int __semctl (struct proc *p, struct __semctl_args *uap);
 struct semget_args;
-int semget __P((struct proc *p, struct semget_args *uap));
+int semget (struct proc *p, struct semget_args *uap);
 struct semop_args;
-int semop __P((struct proc *p, struct semop_args *uap));
+int semop (struct proc *p, struct semop_args *uap);
 #endif
 
-static struct sem_undo *semu_alloc __P((struct proc *p));
-static int semundo_adjust __P((struct proc *p, struct sem_undo **supptr, 
-		int semid, int semnum, int adjval));
-static void semundo_clear __P((int semid, int semnum));
+static struct sem_undo *semu_alloc (struct proc *p);
+static int semundo_adjust (struct proc *p, struct sem_undo **supptr, 
+		int semid, int semnum, int adjval);
+static void semundo_clear (int semid, int semnum);
 
 /* XXX casting to (sy_call_t *) is bogus, as usual. */
 static sy_call_t *semcalls[] = {
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 126492ee1b..a83e6c98d3 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/kern/sysv_shm.c,v 1.45.2.6 2002/10/22 20:45:03 fjoe Exp $ */
-/* $DragonFly: src/sys/kern/sysv_shm.c,v 1.10 2003/08/03 17:11:36 dillon Exp $ */
+/* $DragonFly: src/sys/kern/sysv_shm.c,v 1.11 2003/08/26 21:09:02 rob Exp $ */
 /*	$NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $	*/
 
 /*
@@ -60,10 +60,10 @@
 static MALLOC_DEFINE(M_SHM, "shm", "SVID compatible shared memory segments");
 
 struct oshmctl_args;
-static int oshmctl __P((struct proc *p, struct oshmctl_args *uap));
+static int oshmctl (struct proc *p, struct oshmctl_args *uap);
 
-static int shmget_allocate_segment __P((struct proc *p, struct shmget_args *uap, int mode));
-static int shmget_existing __P((struct proc *p, struct shmget_args *uap, int mode, int segnum));
+static int shmget_allocate_segment (struct proc *p, struct shmget_args *uap, int mode);
+static int shmget_existing (struct proc *p, struct shmget_args *uap, int mode, int segnum);
 
 /* XXX casting to (sy_call_t *) is bogus, as usual. */
 static sy_call_t *shmcalls[] = {
@@ -90,12 +90,12 @@ struct shmmap_state {
 	int shmid;
 };
 
-static void shm_deallocate_segment __P((struct shmid_ds *));
-static int shm_find_segment_by_key __P((key_t));
-static struct shmid_ds *shm_find_segment_by_shmid __P((int));
-static int shm_delete_mapping __P((struct vmspace *vm, struct shmmap_state *));
-static void shmrealloc __P((void));
-static void shminit __P((void *));
+static void shm_deallocate_segment (struct shmid_ds *);
+static int shm_find_segment_by_key (key_t);
+static struct shmid_ds *shm_find_segment_by_shmid (int);
+static int shm_delete_mapping (struct vmspace *vm, struct shmmap_state *);
+static void shmrealloc (void);
+static void shminit (void *);
 
 /*
  * Tuneable values
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index eced4dc6d9..f61a0807a5 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -37,7 +37,7 @@
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/tty.c,v 1.129.2.5 2002/03/11 01:32:31 dd Exp $
- * $DragonFly: src/sys/kern/tty.c,v 1.6 2003/07/26 19:42:11 rob Exp $
+ * $DragonFly: src/sys/kern/tty.c,v 1.7 2003/08/26 21:09:02 rob Exp $
  */
 
 /*-
@@ -100,20 +100,20 @@
 
 MALLOC_DEFINE(M_TTYS, "ttys", "tty data structures");
 
-static int	proc_compare __P((struct proc *p1, struct proc *p2));
-static int	ttnread __P((struct tty *tp));
-static void	ttyecho __P((int c, struct tty *tp));
-static int	ttyoutput __P((int c, struct tty *tp));
-static void	ttypend __P((struct tty *tp));
-static void	ttyretype __P((struct tty *tp));
-static void	ttyrub __P((int c, struct tty *tp));
-static void	ttyrubo __P((struct tty *tp, int cnt));
-static void	ttyunblock __P((struct tty *tp));
-static int	ttywflush __P((struct tty *tp));
-static int	filt_ttyread __P((struct knote *kn, long hint));
-static void 	filt_ttyrdetach __P((struct knote *kn));
-static int	filt_ttywrite __P((struct knote *kn, long hint));
-static void 	filt_ttywdetach __P((struct knote *kn));
+static int	proc_compare (struct proc *p1, struct proc *p2);
+static int	ttnread (struct tty *tp);
+static void	ttyecho (int c, struct tty *tp);
+static int	ttyoutput (int c, struct tty *tp);
+static void	ttypend (struct tty *tp);
+static void	ttyretype (struct tty *tp);
+static void	ttyrub (int c, struct tty *tp);
+static void	ttyrubo (struct tty *tp, int cnt);
+static void	ttyunblock (struct tty *tp);
+static int	ttywflush (struct tty *tp);
+static int	filt_ttyread (struct knote *kn, long hint);
+static void 	filt_ttyrdetach (struct knote *kn);
+static int	filt_ttywrite (struct knote *kn, long hint);
+static void 	filt_ttywdetach (struct knote *kn);
 
 /*
  * Table with character classes and parity. The 8th bit indicates parity,
diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c
index 283d26fb90..05b3d90c83 100644
--- a/sys/kern/tty_compat.c
+++ b/sys/kern/tty_compat.c
@@ -32,7 +32,7 @@
  *
  *	@(#)tty_compat.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/kern/tty_compat.c,v 1.29 1999/08/28 00:46:20 peter Exp $
- * $DragonFly: src/sys/kern/tty_compat.c,v 1.3 2003/07/26 19:42:11 rob Exp $
+ * $DragonFly: src/sys/kern/tty_compat.c,v 1.4 2003/08/26 21:09:02 rob Exp $
  */
 
 #include "opt_compat.h"
@@ -49,10 +49,10 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 
-static int ttcompatgetflags	__P((struct tty	*tp));
-static void ttcompatsetflags	__P((struct tty	*tp, struct termios *t));
-static void ttcompatsetlflags	__P((struct tty	*tp, struct termios *t));
-static int ttcompatspeedtab	__P((int speed, struct speedtab *table));
+static int ttcompatgetflags	(struct tty	*tp);
+static void ttcompatsetflags	(struct tty	*tp, struct termios *t);
+static void ttcompatsetlflags	(struct tty	*tp, struct termios *t);
+static int ttcompatspeedtab	(int speed, struct speedtab *table);
 
 static int ttydebug = 0;
 SYSCTL_INT(_debug, OID_AUTO, ttydebug, CTLFLAG_RW, &ttydebug, 0, "");
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 10ba8a0c84..84235fd2cb 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -32,7 +32,7 @@
  *
  *	@(#)tty_pty.c	8.4 (Berkeley) 2/20/95
  * $FreeBSD: src/sys/kern/tty_pty.c,v 1.74.2.4 2002/02/20 19:58:13 dillon Exp $
- * $DragonFly: src/sys/kern/tty_pty.c,v 1.9 2003/08/07 21:17:23 dillon Exp $
+ * $DragonFly: src/sys/kern/tty_pty.c,v 1.10 2003/08/26 21:09:02 rob Exp $
  */
 
 /*
@@ -60,10 +60,10 @@
 
 MALLOC_DEFINE(M_PTY, "ptys", "pty data structures");
 
-static void ptsstart __P((struct tty *tp));
-static void ptsstop __P((struct tty *tp, int rw));
-static void ptcwakeup __P((struct tty *tp, int flag));
-static void ptyinit __P((int n));
+static void ptsstart (struct tty *tp);
+static void ptsstop (struct tty *tp, int rw);
+static void ptcwakeup (struct tty *tp, int flag);
+static void ptyinit (int n);
 
 static	d_open_t	ptsopen;
 static	d_close_t	ptsclose;
@@ -825,7 +825,7 @@ ptyioctl(dev, cmd, data, flag, td)
 }
 
 
-static void ptc_drvinit __P((void *unused));
+static void ptc_drvinit (void *unused);
 
 static void
 ptc_drvinit(unused)
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index 4fcda23fb8..f679c99afc 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/tty_subr.c,v 1.32 1999/08/28 00:46:21 peter Exp $
- * $DragonFly: src/sys/kern/tty_subr.c,v 1.2 2003/06/17 04:28:41 dillon Exp $
+ * $DragonFly: src/sys/kern/tty_subr.c,v 1.3 2003/08/26 21:09:02 rob Exp $
  */
 
 /*
@@ -39,7 +39,7 @@
 #include <sys/tty.h>
 #include <sys/clist.h>
 
-static void clist_init __P((void *));
+static void clist_init (void *);
 SYSINIT(clist, SI_SUB_CLIST, SI_ORDER_FIRST, clist_init, NULL)
 
 static struct cblock *cfreelist = 0;
@@ -51,10 +51,10 @@ static int ctotcount;
 #define	INITIAL_CBLOCKS 50
 #endif
 
-static struct cblock *cblock_alloc __P((void));
-static void cblock_alloc_cblocks __P((int number));
-static void cblock_free __P((struct cblock *cblockp));
-static void cblock_free_cblocks __P((int number));
+static struct cblock *cblock_alloc (void);
+static void cblock_alloc_cblocks (int number);
+static void cblock_free (struct cblock *cblockp);
+static void cblock_free_cblocks (int number);
 
 #include "opt_ddb.h"
 #ifdef DDB
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index d3de6eef03..abc1b1db90 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -32,7 +32,7 @@
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
  * $FreeBSD: src/sys/kern/tty_tty.c,v 1.30 1999/09/25 18:24:24 phk Exp $
- * $DragonFly: src/sys/kern/tty_tty.c,v 1.5 2003/07/21 05:50:43 dillon Exp $
+ * $DragonFly: src/sys/kern/tty_tty.c,v 1.6 2003/08/26 21:09:02 rob Exp $
  */
 
 /*
@@ -196,7 +196,7 @@ cttypoll(dev_t dev, int events, struct thread *td)
 	return (VOP_POLL(ttyvp, events, p->p_ucred, td));
 }
 
-static void ctty_drvinit __P((void *unused));
+static void ctty_drvinit (void *unused);
 static void
 ctty_drvinit(unused)
 	void *unused;
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index f3b2ac4e2f..5411826694 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -32,7 +32,7 @@
  *
  *	@(#)uipc_domain.c	8.2 (Berkeley) 10/18/93
  * $FreeBSD: src/sys/kern/uipc_domain.c,v 1.22.2.1 2001/07/03 11:01:37 ume Exp $
- * $DragonFly: src/sys/kern/uipc_domain.c,v 1.3 2003/07/26 19:42:11 rob Exp $
+ * $DragonFly: src/sys/kern/uipc_domain.c,v 1.4 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -59,11 +59,11 @@
  * passed to the doamin_add() function.
  */
 
-static void domaininit __P((void *));
+static void domaininit (void *);
 SYSINIT(domain, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, domaininit, NULL)
 
-static void	pffasttimo __P((void *));
-static void	pfslowtimo __P((void *));
+static void	pffasttimo (void *);
+static void	pfslowtimo (void *);
 
 struct domain *domains;
 
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 9e568ec97c..2a23006674 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -32,7 +32,7 @@
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.51.2.24 2003/04/15 06:59:29 silby Exp $
- * $DragonFly: src/sys/kern/uipc_mbuf.c,v 1.11 2003/08/25 19:50:32 dillon Exp $
+ * $DragonFly: src/sys/kern/uipc_mbuf.c,v 1.12 2003/08/26 21:09:02 rob Exp $
  */
 
 #include "opt_param.h"
@@ -56,7 +56,7 @@
 #include <machine/cpu.h>
 #endif
 
-static void mbinit __P((void *));
+static void mbinit (void *);
 SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbinit, NULL)
 
 struct mbuf *mbutl;
@@ -112,7 +112,7 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, m_defragrandomfailures, CTLFLAG_RW,
 	   &m_defragrandomfailures, 0, "");
 #endif
 
-static void	m_reclaim __P((void));
+static void	m_reclaim (void);
 
 #ifndef NMBCLUSTERS
 #define NMBCLUSTERS	(512 + maxusers * 16)
@@ -1429,7 +1429,7 @@ m_devget(buf, totlen, off0, ifp, copy)
 	char *buf;
 	int totlen, off0;
 	struct ifnet *ifp;
-	void (*copy) __P((char *from, caddr_t to, u_int len));
+	void (*copy) (char *from, caddr_t to, u_int len);
 {
 	struct mbuf *m;
 	struct mbuf *top = 0, **mp = &top;
diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c
index cb93da49ac..b4fb162d23 100644
--- a/sys/kern/uipc_mbuf2.c
+++ b/sys/kern/uipc_mbuf2.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/kern/uipc_mbuf2.c,v 1.2.2.5 2003/01/23 21:06:44 sam Exp $	*/
-/*	$DragonFly: src/sys/kern/uipc_mbuf2.c,v 1.3 2003/07/23 02:30:20 dillon Exp $	*/
+/*	$DragonFly: src/sys/kern/uipc_mbuf2.c,v 1.4 2003/08/26 21:09:02 rob Exp $	*/
 /*	$KAME: uipc_mbuf2.c,v 1.31 2001/11/28 11:08:53 itojun Exp $	*/
 /*	$NetBSD: uipc_mbuf.c,v 1.40 1999/04/01 00:23:25 thorpej Exp $	*/
 
@@ -83,7 +83,7 @@
 MALLOC_DEFINE(M_PACKET_TAGS, "tag", "packet-attached information");
 
 /* can't call it m_dup(), as freebsd[34] uses m_dup() with different arg */
-static struct mbuf *m_dup1 __P((struct mbuf *, int, int, int));
+static struct mbuf *m_dup1 (struct mbuf *, int, int, int);
 
 /*
  * ensure that [off, off + len) is contiguous on the mbuf chain "m".
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 43630907fc..a60055c80a 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -32,7 +32,7 @@
  *
  *	From: @(#)uipc_usrreq.c	8.3 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.54.2.10 2003/03/04 17:28:09 nectar Exp $
- * $DragonFly: src/sys/kern/uipc_usrreq.c,v 1.6 2003/07/29 21:30:02 hmp Exp $
+ * $DragonFly: src/sys/kern/uipc_usrreq.c,v 1.7 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -77,20 +77,20 @@ static	struct unp_head unp_shead, unp_dhead;
 static struct	sockaddr sun_noname = { sizeof(sun_noname), AF_LOCAL };
 static ino_t	unp_ino;		/* prototype for fake inode numbers */
 
-static int     unp_attach __P((struct socket *));
-static void    unp_detach __P((struct unpcb *));
-static int     unp_bind __P((struct unpcb *,struct sockaddr *, struct thread *));
-static int     unp_connect __P((struct socket *,struct sockaddr *,
-				struct thread *));
-static void    unp_disconnect __P((struct unpcb *));
-static void    unp_shutdown __P((struct unpcb *));
-static void    unp_drop __P((struct unpcb *, int));
-static void    unp_gc __P((void));
-static void    unp_scan __P((struct mbuf *, void (*)(struct file *)));
-static void    unp_mark __P((struct file *));
-static void    unp_discard __P((struct file *));
-static int     unp_internalize __P((struct mbuf *, struct thread *));
-static int     unp_listen __P((struct unpcb *, struct thread *));
+static int     unp_attach (struct socket *);
+static void    unp_detach (struct unpcb *);
+static int     unp_bind (struct unpcb *,struct sockaddr *, struct thread *);
+static int     unp_connect (struct socket *,struct sockaddr *,
+				struct thread *);
+static void    unp_disconnect (struct unpcb *);
+static void    unp_shutdown (struct unpcb *);
+static void    unp_drop (struct unpcb *, int);
+static void    unp_gc (void);
+static void    unp_scan (struct mbuf *, void (*)(struct file *));
+static void    unp_mark (struct file *);
+static void    unp_discard (struct file *);
+static int     unp_internalize (struct mbuf *, struct thread *);
+static int     unp_listen (struct unpcb *, struct thread *);
 
 static int
 uipc_abort(struct socket *so)
@@ -1307,7 +1307,7 @@ unp_listen(struct unpcb *unp, struct thread *td)
 static void
 unp_scan(m0, op)
 	struct mbuf *m0;
-	void (*op) __P((struct file *));
+	void (*op) (struct file *);
 {
 	struct mbuf *m;
 	struct file **rp;
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 3f6559515e..0c4a29d5b6 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -12,7 +12,7 @@
  *		John S. Dyson.
  *
  * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.242.2.20 2003/05/28 18:38:10 alc Exp $
- * $DragonFly: src/sys/kern/vfs_bio.c,v 1.12 2003/08/25 17:01:10 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_bio.c,v 1.13 2003/08/26 21:09:02 rob Exp $
  */
 
 /*
@@ -77,7 +77,7 @@ static int flushbufqueues(void);
 
 static int bd_request;
 
-static void buf_daemon __P((void));
+static void buf_daemon (void);
 /*
  * bogus page -- for I/O to/from partially complete buffers
  * this is a temporary solution to the problem, but it is not
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 6543200c17..c897b5b6b5 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -35,7 +35,7 @@
  *
  *	@(#)vfs_cache.c	8.5 (Berkeley) 3/22/95
  * $FreeBSD: src/sys/kern/vfs_cache.c,v 1.42.2.6 2001/10/05 20:07:03 dillon Exp $
- * $DragonFly: src/sys/kern/vfs_cache.c,v 1.5 2003/07/24 01:41:25 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_cache.c,v 1.6 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -126,7 +126,7 @@ static u_long numnegzaps; STATNODE(CTLFLAG_RD, numnegzaps, &numnegzaps);
 static u_long numneghits; STATNODE(CTLFLAG_RD, numneghits, &numneghits);
 
 
-static void cache_zap __P((struct namecache *ncp));
+static void cache_zap (struct namecache *ncp);
 
 MALLOC_DEFINE(M_VFSCACHE, "vfscache", "VFS name cache entries");
 
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 9da36017cd..16786f325e 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -34,7 +34,7 @@
  *
  *	@(#)vfs_cluster.c	8.7 (Berkeley) 2/13/94
  * $FreeBSD: src/sys/kern/vfs_cluster.c,v 1.92.2.9 2001/11/18 07:10:59 dillon Exp $
- * $DragonFly: src/sys/kern/vfs_cluster.c,v 1.7 2003/07/03 17:24:02 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_cluster.c,v 1.8 2003/08/26 21:09:02 rob Exp $
  */
 
 #include "opt_debug_cluster.h"
@@ -65,10 +65,10 @@ SYSCTL_INT(_debug, OID_AUTO, rcluster, CTLFLAG_RW, &rcluster, 0, "");
 static MALLOC_DEFINE(M_SEGMENT, "cluster_save buffer", "cluster_save buffer");
 
 static struct cluster_save *
-	cluster_collectbufs __P((struct vnode *vp, struct buf *last_bp));
+	cluster_collectbufs (struct vnode *vp, struct buf *last_bp);
 static struct buf *
-	cluster_rbuild __P((struct vnode *vp, u_quad_t filesize, daddr_t lbn,
-			    daddr_t blkno, long size, int run, struct buf *fbp));
+	cluster_rbuild (struct vnode *vp, u_quad_t filesize, daddr_t lbn,
+			    daddr_t blkno, long size, int run, struct buf *fbp);
 
 static int write_behind = 1;
 SYSCTL_INT(_vfs, OID_AUTO, write_behind, CTLFLAG_RW, &write_behind, 0, "");
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index a48354ccc9..bd1ad1e99d 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -37,7 +37,7 @@
  *
  *
  * $FreeBSD: src/sys/kern/vfs_default.c,v 1.28.2.7 2003/01/10 18:23:26 bde Exp $
- * $DragonFly: src/sys/kern/vfs_default.c,v 1.7 2003/07/22 17:03:33 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_default.c,v 1.8 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -60,8 +60,8 @@
 #include <vm/vm_pager.h>
 #include <vm/vnode_pager.h>
 
-static int	vop_nolookup __P((struct vop_lookup_args *));
-static int	vop_nostrategy __P((struct vop_strategy_args *));
+static int	vop_nolookup (struct vop_lookup_args *);
+static int	vop_nostrategy (struct vop_strategy_args *);
 
 /*
  * This vnode table stores what we want to do if the filesystem doesn't
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index d7b31a1b06..c6683ce04c 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -37,7 +37,7 @@
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
  * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.249.2.30 2003/04/04 20:35:57 tegge Exp $
- * $DragonFly: src/sys/kern/vfs_subr.c,v 1.17 2003/08/19 18:36:38 hsu Exp $
+ * $DragonFly: src/sys/kern/vfs_subr.c,v 1.18 2003/08/26 21:09:02 rob Exp $
  */
 
 /*
@@ -85,8 +85,8 @@
 
 static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure");
 
-static void	insmntque __P((struct vnode *vp, struct mount *mp));
-static void	vclean __P((struct vnode *vp, int flags, struct thread *td));
+static void	insmntque (struct vnode *vp, struct mount *mp);
+static void	vclean (struct vnode *vp, int flags, struct thread *td);
 static unsigned long	numvnodes;
 static void	vlruvp(struct vnode *vp);
 SYSCTL_INT(_debug, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0, "");
@@ -166,10 +166,10 @@ static int vnlru_nowhere = 0;
 SYSCTL_INT(_debug, OID_AUTO, vnlru_nowhere, CTLFLAG_RW, &vnlru_nowhere, 0,
     "Number of times the vnlru process ran without success");
 
-static void	vfs_free_addrlist __P((struct netexport *nep));
-static int	vfs_free_netcred __P((struct radix_node *rn, void *w));
-static int	vfs_hang_addrlist __P((struct mount *mp, struct netexport *nep,
-				       struct export_args *argp));
+static void	vfs_free_addrlist (struct netexport *nep);
+static int	vfs_free_netcred (struct radix_node *rn, void *w);
+static int	vfs_hang_addrlist (struct mount *mp, struct netexport *nep,
+				       struct export_args *argp);
 
 /*
  * Initialize the vnode management data structures.
@@ -294,7 +294,7 @@ int
 lite2_vfs_mountroot()
 {
 	struct vfsconf *vfsp;
-	extern int (*lite2_mountroot) __P((void));
+	extern int (*lite2_mountroot) (void);
 	int error;
 
 	if (lite2_mountroot != NULL)
@@ -1149,7 +1149,7 @@ vn_syncer_add_to_worklist(struct vnode *vp, int delay)
 }
 
 struct  thread *updatethread;
-static void sched_sync __P((void));
+static void sched_sync (void);
 static struct kproc_desc up_kp = {
 	"syncer",
 	sched_sync,
@@ -2259,7 +2259,7 @@ DB_SHOW_COMMAND(lockedvnodes, lockedvnodes)
 /*
  * Top level filesystem related information gathering.
  */
-static int	sysctl_ovfs_conf __P((SYSCTL_HANDLER_ARGS));
+static int	sysctl_ovfs_conf (SYSCTL_HANDLER_ARGS);
 
 static int
 vfs_sysctl(SYSCTL_HANDLER_ARGS)
@@ -2898,14 +2898,14 @@ vn_pollgone(vp)
 /*
  * Routine to create and manage a filesystem syncer vnode.
  */
-#define sync_close ((int (*) __P((struct  vop_close_args *)))nullop)
-static int	sync_fsync __P((struct  vop_fsync_args *));
-static int	sync_inactive __P((struct  vop_inactive_args *));
-static int	sync_reclaim  __P((struct  vop_reclaim_args *));
-#define sync_lock ((int (*) __P((struct  vop_lock_args *)))vop_nolock)
-#define sync_unlock ((int (*) __P((struct  vop_unlock_args *)))vop_nounlock)
-static int	sync_print __P((struct vop_print_args *));
-#define sync_islocked ((int(*) __P((struct vop_islocked_args *)))vop_noislocked)
+#define sync_close ((int (*) (struct  vop_close_args *))nullop)
+static int	sync_fsync (struct  vop_fsync_args *);
+static int	sync_inactive (struct  vop_inactive_args *);
+static int	sync_reclaim  (struct  vop_reclaim_args *);
+#define sync_lock ((int (*) (struct  vop_lock_args *))vop_nolock)
+#define sync_unlock ((int (*) (struct  vop_unlock_args *))vop_nounlock)
+static int	sync_print (struct vop_print_args *);
+#define sync_islocked ((int(*) (struct vop_islocked_args *))vop_noislocked)
 
 static vop_t **sync_vnodeop_p;
 static struct vnodeopv_entry_desc sync_vnodeop_entries[] = {
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 6128799928..a4ba4536fe 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -37,7 +37,7 @@
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
  * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.151.2.18 2003/04/04 20:35:58 tegge Exp $
- * $DragonFly: src/sys/kern/vfs_syscalls.c,v 1.15 2003/08/07 21:17:23 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_syscalls.c,v 1.16 2003/08/26 21:09:02 rob Exp $
  */
 
 /* For 4.3 integer FS ID compatibility */
@@ -73,17 +73,17 @@
 
 #include <sys/file2.h>
 
-static int change_dir __P((struct nameidata *ndp, struct thread *td));
-static void checkdirs __P((struct vnode *olddp));
-static int chroot_refuse_vdir_fds __P((struct filedesc *fdp));
-static int getutimes __P((const struct timeval *, struct timespec *));
-static int setfown __P((struct vnode *, uid_t, gid_t));
-static int setfmode __P((struct vnode *, int));
-static int setfflags __P((struct vnode *, int));
-static int setutimes __P((struct vnode *, const struct timespec *, int));
+static int change_dir (struct nameidata *ndp, struct thread *td);
+static void checkdirs (struct vnode *olddp);
+static int chroot_refuse_vdir_fds (struct filedesc *fdp);
+static int getutimes (const struct timeval *, struct timespec *);
+static int setfown (struct vnode *, uid_t, gid_t);
+static int setfmode (struct vnode *, int);
+static int setfflags (struct vnode *, int);
+static int setutimes (struct vnode *, const struct timespec *, int);
 static int	usermount = 0;	/* if 1, non-root can mount fs. */
 
-int (*union_dircheckp) __P((struct thread *, struct vnode **, struct file *));
+int (*union_dircheckp) (struct thread *, struct vnode **, struct file *);
 
 SYSCTL_INT(_vfs, OID_AUTO, usermount, CTLFLAG_RW, &usermount, 0, "");
 
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 1b1bf37edd..6106c1a42b 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -37,7 +37,7 @@
  *
  *	@(#)vfs_vnops.c	8.2 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.87.2.13 2002/12/29 18:19:53 dillon Exp $
- * $DragonFly: src/sys/kern/vfs_vnops.c,v 1.11 2003/07/29 20:03:05 dillon Exp $
+ * $DragonFly: src/sys/kern/vfs_vnops.c,v 1.12 2003/08/26 21:09:02 rob Exp $
  */
 
 #include <sys/param.h>
@@ -55,17 +55,17 @@
 #include <sys/conf.h>
 #include <sys/syslog.h>
 
-static int vn_closefile __P((struct file *fp, struct thread *td));
-static int vn_ioctl __P((struct file *fp, u_long com, caddr_t data, 
-		struct thread *td));
-static int vn_read __P((struct file *fp, struct uio *uio, 
-		struct ucred *cred, int flags, struct thread *td));
-static int vn_poll __P((struct file *fp, int events, struct ucred *cred,
-		struct thread *td));
-static int vn_kqfilter __P((struct file *fp, struct knote *kn));
-static int vn_statfile __P((struct file *fp, struct stat *sb, struct thread *td));
-static int vn_write __P((struct file *fp, struct uio *uio, 
-		struct ucred *cred, int flags, struct thread *td));
+static int vn_closefile (struct file *fp, struct thread *td);
+static int vn_ioctl (struct file *fp, u_long com, caddr_t data, 
+		struct thread *td);
+static int vn_read (struct file *fp, struct uio *uio, 
+		struct ucred *cred, int flags, struct thread *td);
+static int vn_poll (struct file *fp, int events, struct ucred *cred,
+		struct thread *td);
+static int vn_kqfilter (struct file *fp, struct knote *kn);
+static int vn_statfile (struct file *fp, struct stat *sb, struct thread *td);
+static int vn_write (struct file *fp, struct uio *uio, 
+		struct ucred *cred, int flags, struct thread *td);
 
 struct 	fileops vnops = {
 	NULL,	/* port */
diff --git a/sys/kern/vnode_if.pl b/sys/kern/vnode_if.pl
index d327fb8e91..6c7048f3c8 100644
--- a/sys/kern/vnode_if.pl
+++ b/sys/kern/vnode_if.pl
@@ -36,7 +36,7 @@ eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
 # $FreeBSD: src/sys/kern/vnode_if.pl,v 1.21.2.1 2002/01/06 06:46:21 silby Exp $
-# $DragonFly: src/sys/kern/Attic/vnode_if.pl,v 1.2 2003/06/17 04:28:42 dillon Exp $
+# $DragonFly: src/sys/kern/Attic/vnode_if.pl,v 1.3 2003/08/26 21:09:02 rob Exp $
 #
 # Script to produce VFS front-end sugar.
 #
@@ -220,11 +220,11 @@ line: while (<SRC>) {
 	print HEADER "extern struct vnodeop_desc ${name}_desc;\n";
 
 	# Print out prototype.
-	print HEADER "static __inline int ${uname} __P((\n";
+	print HEADER "static __inline int ${uname} (\n";
 	for ($c2 = 0; $c2 < $numargs; ++$c2) {
 	    $a{$c2} =~ /^\s*(INOUT|OUT|IN)(\s+WILLRELE)?\s+(.*?)\s+(\**\S*)\;/;
 	    print HEADER "\t$3 $4" .
-		($c2 < $numargs-1 ? "," : "));") . "\n";
+		($c2 < $numargs-1 ? "," : ");") . "\n";
 	}
 
 	# Print out function.
-- 
2.41.0