First round of __P removal in sys

91 files changed, 819 insertions, 822 deletions

diff --git a/sys/arch/i386/eisa/eisa_machdep.c b/sys/arch/i386/eisa/eisa_machdep.c
index eae0803e813..15e1bf6bdd1 100644
--- a/sys/arch/i386/eisa/eisa_machdep.c
+++ b/sys/arch/i386/eisa/eisa_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eisa_machdep.c,v 1.4 2001/07/04 08:57:45 niklas Exp $	*/
+/*	$OpenBSD: eisa_machdep.c,v 1.5 2002/03/14 01:26:32 millert Exp $	*/
 /*	$NetBSD: eisa_machdep.c,v 1.6 1997/06/06 23:12:52 thorpej Exp $	*/
 
 /*-
@@ -167,7 +167,7 @@ void *
 eisa_intr_establish(ec, ih, type, level, func, arg, what)
 	eisa_chipset_tag_t ec;
 	eisa_intr_handle_t ih;
-	int type, level, (*func) __P((void *));
+	int type, level, (*func)(void *);
 	void *arg;
 	char *what;
 {
diff --git a/sys/arch/i386/eisa/eisa_machdep.h b/sys/arch/i386/eisa/eisa_machdep.h
index 2ac1f5810c3..b1746e33ed8 100644
--- a/sys/arch/i386/eisa/eisa_machdep.h
+++ b/sys/arch/i386/eisa/eisa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eisa_machdep.h,v 1.3 1998/01/20 18:40:13 niklas Exp $	*/
+/*	$OpenBSD: eisa_machdep.h,v 1.4 2002/03/14 01:26:32 millert Exp $	*/
 /*	$NetBSD: eisa_machdep.h,v 1.4 1997/06/06 23:12:52 thorpej Exp $	*/
 
 /*
@@ -54,13 +54,13 @@ typedef int eisa_intr_handle_t;
 /*
  * Functions provided to machine-independent EISA code.
  */
-void		eisa_attach_hook __P((struct device *, struct device *,
-		    struct eisabus_attach_args *));
-int		eisa_maxslots __P((eisa_chipset_tag_t));
-int		eisa_intr_map __P((eisa_chipset_tag_t, u_int,
-		    eisa_intr_handle_t *));
-const char	*eisa_intr_string __P((eisa_chipset_tag_t, eisa_intr_handle_t));
+void		eisa_attach_hook(struct device *, struct device *,
+		    struct eisabus_attach_args *);
+int		eisa_maxslots(eisa_chipset_tag_t);
+int		eisa_intr_map(eisa_chipset_tag_t, u_int,
+		    eisa_intr_handle_t *);
+const char	*eisa_intr_string(eisa_chipset_tag_t, eisa_intr_handle_t);
 void		*eisa_intr_establish __P((eisa_chipset_tag_t,
 		    eisa_intr_handle_t, int, int, int (*)(void *), void *,
 		    char *));
-void		eisa_intr_disestablish __P((eisa_chipset_tag_t, void *));
+void		eisa_intr_disestablish(eisa_chipset_tag_t, void *);
diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c
index 32b81af91ae..236b226745e 100644
--- a/sys/arch/i386/i386/apm.c
+++ b/sys/arch/i386/i386/apm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apm.c,v 1.51 2002/01/16 20:50:16 miod Exp $	*/
+/*	$OpenBSD: apm.c,v 1.52 2002/03/14 01:26:32 millert Exp $	*/
 
 /*-
  * Copyright (c) 1998-2001 Michael Shalayeff. All rights reserved.
@@ -94,15 +94,15 @@ struct apm_softc {
 #define	SCFLAG_OWRITE	0x0000002
 #define	SCFLAG_OPEN	(SCFLAG_OREAD|SCFLAG_OWRITE)
 
-int apmprobe __P((struct device *, void *, void *));
-void apmattach __P((struct device *, struct device *, void *));
+int apmprobe(struct device *, void *, void *);
+void apmattach(struct device *, struct device *, void *);
 
 struct cfattach apm_ca = {
 	sizeof(struct apm_softc), apmprobe, apmattach
 };
 
-void filt_apmrdetach __P((struct knote *kn));
-int filt_apmread __P((struct knote *kn, long hint));
+void filt_apmrdetach(struct knote *kn);
+int filt_apmread(struct knote *kn, long hint);
 
 struct filterops apmread_filtops =
 	{ 1, NULL, filt_apmrdetach, filt_apmread};
@@ -160,25 +160,25 @@ struct apmregs {
 	u_int32_t	dx;
 };
 
-int  apmcall __P((u_int, u_int, struct apmregs *));
-void apm_power_print __P((struct apm_softc *, struct apmregs *));
-int  apm_handle_event __P((struct apm_softc *, struct apmregs *));
-void apm_set_ver __P((struct apm_softc *));
-int  apm_periodic_check __P((struct apm_softc *));
-void apm_thread_create __P((void *v));
-void apm_thread __P((void *));
-void apm_disconnect __P((struct apm_softc *));
-void apm_perror __P((const char *, struct apmregs *));
-void apm_powmgt_enable __P((int onoff));
-void apm_powmgt_engage __P((int onoff, u_int devid));
-/* void apm_devpowmgt_enable __P((int onoff, u_int devid)); */
-int  apm_record_event __P((struct apm_softc *sc, u_int type));
-const char *apm_err_translate __P((int code));
+int  apmcall(u_int, u_int, struct apmregs *);
+void apm_power_print(struct apm_softc *, struct apmregs *);
+int  apm_handle_event(struct apm_softc *, struct apmregs *);
+void apm_set_ver(struct apm_softc *);
+int  apm_periodic_check(struct apm_softc *);
+void apm_thread_create(void *v);
+void apm_thread(void *);
+void apm_disconnect(struct apm_softc *);
+void apm_perror(const char *, struct apmregs *);
+void apm_powmgt_enable(int onoff);
+void apm_powmgt_engage(int onoff, u_int devid);
+/* void apm_devpowmgt_enable(int onoff, u_int devid); */
+int  apm_record_event(struct apm_softc *sc, u_int type);
+const char *apm_err_translate(int code);
 
 #define	apm_get_powstat(r) apmcall(APM_POWER_STATUS, APM_DEV_ALLDEVS, r)
-void	apm_standby __P((void));
-void	apm_suspend __P((void));
-void	apm_resume __P((struct apm_softc *, struct apmregs *));
+void	apm_standby(void);
+void	apm_suspend(void);
+void	apm_resume(struct apm_softc *, struct apmregs *);
 
 static int __inline
 apm_get_event(struct apmregs *r)
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index 5f51e92398f..db2839eb7e8 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.42 2002/01/09 23:08:34 nordin Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.43 2002/03/14 01:26:32 millert Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $	*/
 
 /*-
@@ -65,13 +65,13 @@
 
 #include <dev/cons.h>
 
-int findblkmajor __P((struct device *dv));
-char *findblkname __P((int));
+int findblkmajor(struct device *dv);
+char *findblkname(int);
 
-void rootconf __P((void));
-void swapconf __P((void));
-void setroot __P((void));
-void diskconf __P((void));
+void rootconf(void);
+void swapconf(void);
+void setroot(void);
+void diskconf(void);
 
 /*
  * The following several variables are related to
diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c
index 59516efacc8..14c711811ae 100644
--- a/sys/arch/i386/i386/bios.c
+++ b/sys/arch/i386/i386/bios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bios.c,v 1.47 2001/11/06 19:53:14 miod Exp $	*/
+/*	$OpenBSD: bios.c,v 1.48 2002/03/14 01:26:32 millert Exp $	*/
 
 /*
  * Copyright (c) 1997-2001 Michael Shalayeff
@@ -69,9 +69,9 @@ struct bios_softc {
 	struct	device sc_dev;
 };
 
-int biosprobe __P((struct device *, void *, void *));
-void biosattach __P((struct device *, struct device *, void *));
-int bios_print __P((void *, const char *));
+int biosprobe(struct device *, void *, void *);
+void biosattach(struct device *, struct device *, void *);
+int bios_print(void *, const char *);
 
 struct cfattach bios_ca = {
 	sizeof(struct bios_softc), biosprobe, biosattach
@@ -94,7 +94,7 @@ bios_memmap_t	*bios_memmap;
 u_int32_t	bios_cksumlen;
 struct bios32_entry bios32_entry;
 
-bios_diskinfo_t *bios_getdiskinfo __P((dev_t));
+bios_diskinfo_t *bios_getdiskinfo(dev_t);
 
 int
 biosprobe(parent, match, aux)
@@ -370,7 +370,7 @@ bios32_service(service, e, ei)
 	bios32_entry_info_t ei;
 {
 	extern union descriptor *dynamic_gdt;
-	extern int gdt_get_slot __P((void));
+	extern int gdt_get_slot(void);
 
 	u_long pa, endpa;
 	vaddr_t va, sva;
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index cf31d323725..2ee931f3b8f 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.87 2002/01/23 04:48:02 ericj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.88 2002/03/14 01:26:32 millert Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -485,8 +485,8 @@ blktochr(dev)
  * disk driver name -> bdev major number table, which follows.
  * Note: floppies are not included as those are differentiated by the BIOS.
  */
-int findblkmajor __P((struct device *dv));
-dev_t dev_rawpart __P((struct device *));	/* XXX */
+int findblkmajor(struct device *dv);
+dev_t dev_rawpart(struct device *);	/* XXX */
 
 dev_t
 dev_rawpart(dv)
diff --git a/sys/arch/i386/i386/db_disasm.c b/sys/arch/i386/i386/db_disasm.c
index 43e36e23929..1adc5cb1f3f 100644
--- a/sys/arch/i386/i386/db_disasm.c
+++ b/sys/arch/i386/i386/db_disasm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_disasm.c,v 1.6 2001/07/04 08:57:46 niklas Exp $	*/
+/*	$OpenBSD: db_disasm.c,v 1.7 2002/03/14 01:26:32 millert Exp $	*/
 /*	$NetBSD: db_disasm.c,v 1.11 1996/05/03 19:41:58 christos Exp $	*/
 
 /* 
@@ -858,9 +858,9 @@ int db_lengths[] = {
 	} while (0)
 
 
-db_addr_t db_read_address __P((db_addr_t, int, int, struct i_addr *));
-void db_print_address __P((char *, int, struct i_addr *));
-db_addr_t db_disasm_esc __P((db_addr_t, int, int, int, char *));
+db_addr_t db_read_address(db_addr_t, int, int, struct i_addr *);
+void db_print_address(char *, int, struct i_addr *);
+db_addr_t db_disasm_esc(db_addr_t, int, int, int, char *);
 
 /*
  * Read address at location and return updated location.
diff --git a/sys/arch/i386/i386/db_interface.c b/sys/arch/i386/i386/db_interface.c
index a88160028a1..edaa3d6fd42 100644
--- a/sys/arch/i386/i386/db_interface.c
+++ b/sys/arch/i386/i386/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.10 2002/02/18 23:26:18 mickey Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.11 2002/03/14 01:26:32 millert Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.22 1996/05/03 19:42:00 christos Exp $	*/
 
 /* 
@@ -56,7 +56,7 @@ extern int trap_types;
 
 int	db_active = 0;
 
-void kdbprinttrap __P((int, int));
+void kdbprinttrap(int, int);
 
 /*
  * Print trap reason.
diff --git a/sys/arch/i386/i386/db_trace.c b/sys/arch/i386/i386/db_trace.c
index d841bec0513..7113b111aa1 100644
--- a/sys/arch/i386/i386/db_trace.c
+++ b/sys/arch/i386/i386/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.4 1997/03/21 02:10:42 niklas Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.5 2002/03/14 01:26:32 millert Exp $	*/
 /*	$NetBSD: db_trace.c,v 1.18 1996/05/03 19:42:01 christos Exp $	*/
 
 /* 
@@ -81,9 +81,9 @@ db_addr_t	db_syscall_symbol_value = 0;
 db_addr_t	db_kdintr_symbol_value = 0;
 boolean_t	db_trace_symbols_found = FALSE;
 
-void db_find_trace_symbols __P((void));
-int db_numargs __P((struct i386_frame *));
-void db_nextframe __P((struct i386_frame **, db_addr_t *, int *, int));
+void db_find_trace_symbols(void);
+int db_numargs(struct i386_frame *);
+void db_nextframe(struct i386_frame **, db_addr_t *, int *, int);
 
 void
 db_find_trace_symbols()
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c
index 50ab3bbdf7b..cf51d7435a4 100644
--- a/sys/arch/i386/i386/disksubr.c
+++ b/sys/arch/i386/i386/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.41 2002/02/19 02:46:40 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.42 2002/03/14 01:26:32 millert Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -74,7 +74,7 @@ dk_establish(dk, dev)
 char *
 readdisklabel(dev, strat, lp, osdep, spoofonly)
 	dev_t dev;
-	void (*strat) __P((struct buf *));
+	void (*strat)(struct buf *);
 	register struct disklabel *lp;
 	struct cpu_disklabel *osdep;
 	int spoofonly;
@@ -397,7 +397,7 @@ setdisklabel(olp, nlp, openmask, osdep)
 int
 writedisklabel(dev, strat, lp, osdep)
 	dev_t dev;
-	void (*strat) __P((struct buf *));
+	void (*strat)(struct buf *);
 	register struct disklabel *lp;
 	struct cpu_disklabel *osdep;
 {
diff --git a/sys/arch/i386/i386/dkcsum.c b/sys/arch/i386/i386/dkcsum.c
index 4f97fe5e662..24f4af430b1 100644
--- a/sys/arch/i386/i386/dkcsum.c
+++ b/sys/arch/i386/i386/dkcsum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dkcsum.c,v 1.9 1999/09/12 19:44:04 weingart Exp $	*/
+/*	$OpenBSD: dkcsum.c,v 1.10 2002/03/14 01:26:32 millert Exp $	*/
 
 /*-
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -51,7 +51,7 @@
 
 #define	b_cylin	b_resid
 
-dev_t dev_rawpart __P((struct device *));	/* XXX */
+dev_t dev_rawpart(struct device *);	/* XXX */
 
 extern u_int32_t bios_cksumlen;
 extern bios_diskinfo_t *bios_diskinfo;
diff --git a/sys/arch/i386/i386/gdt.c b/sys/arch/i386/i386/gdt.c
index e40401e4e6b..0cecf82c3e2 100644
--- a/sys/arch/i386/i386/gdt.c
+++ b/sys/arch/i386/i386/gdt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdt.c,v 1.18 2002/01/09 23:08:34 nordin Exp $	*/
+/*	$OpenBSD: gdt.c,v 1.19 2002/03/14 01:26:32 millert Exp $	*/
 /*	$NetBSD: gdt.c,v 1.8 1996/05/03 19:42:06 christos Exp $	*/
 
 /*-
@@ -59,13 +59,13 @@ int gdt_flags;
 #define	GDT_LOCKED	0x1
 #define	GDT_WANTED	0x2
 
-static __inline void gdt_lock __P((void));
-static __inline void gdt_unlock __P((void));
-void gdt_compact __P((void));
-void gdt_grow __P((void));
-void gdt_shrink __P((void));
-int gdt_get_slot __P((void));
-void gdt_put_slot __P((int));
+static __inline void gdt_lock(void);
+static __inline void gdt_unlock(void);
+void gdt_compact(void);
+void gdt_grow(void);
+void gdt_shrink(void);
+int gdt_get_slot(void);
+void gdt_put_slot(int);
 
 /*
  * Lock and unlock the GDT, to avoid races in case gdt_{ge,pu}t_slot() sleep
diff --git a/sys/arch/i386/i386/i686_mem.c b/sys/arch/i386/i386/i686_mem.c
index 96ce9ce5205..be862ff0e90 100644
--- a/sys/arch/i386/i386/i686_mem.c
+++ b/sys/arch/i386/i386/i686_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i686_mem.c,v 1.3 1999/11/24 01:43:32 deraadt Exp $ */
+/* $OpenBSD: i686_mem.c,v 1.4 2002/03/14 01:26:32 millert Exp $ */
 /*-
  * Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
  * All rights reserved.
@@ -60,11 +60,11 @@ char *mem_owner_bios = "BIOS";
 
 #define mrcopyflags(curr, new) (((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK))
 
-void	i686_mrinit __P((struct mem_range_softc *sc));
-int	i686_mrset __P((struct mem_range_softc *sc,
+void	i686_mrinit(struct mem_range_softc *sc);
+int	i686_mrset(struct mem_range_softc *sc,
 			   struct mem_range_desc *mrd,
-			   int *arg));
-void	i686_mrAPinit __P((struct mem_range_softc *sc));
+			   int *arg);
+void	i686_mrAPinit(struct mem_range_softc *sc);
 
 struct mem_range_ops i686_mrops = {
 	i686_mrinit,
@@ -75,20 +75,20 @@ struct mem_range_ops i686_mrops = {
 /* XXX for AP startup hook */
 u_int64_t	mtrrcap, mtrrdef;
 
-struct mem_range_desc	*mem_range_match __P((struct mem_range_softc *sc,
-						      struct mem_range_desc *mrd));
-void			 i686_mrfetch __P((struct mem_range_softc *sc));
-int			 i686_mtrrtype __P((int flags));
-void			 i686_mrstore __P((struct mem_range_softc *sc));
-void			 i686_mrstoreone __P((void *arg));
-struct mem_range_desc	*i686_mtrrfixsearch __P((struct mem_range_softc *sc,
-						    u_int64_t addr));
-int			 i686_mrsetlow __P((struct mem_range_softc *sc,
+struct mem_range_desc	*mem_range_match(struct mem_range_softc *sc,
+						      struct mem_range_desc *mrd);
+void			 i686_mrfetch(struct mem_range_softc *sc);
+int			 i686_mtrrtype(int flags);
+void			 i686_mrstore(struct mem_range_softc *sc);
+void			 i686_mrstoreone(void *arg);
+struct mem_range_desc	*i686_mtrrfixsearch(struct mem_range_softc *sc,
+						    u_int64_t addr);
+int			 i686_mrsetlow(struct mem_range_softc *sc,
 					      struct mem_range_desc *mrd,
-					      int *arg));
-int			 i686_mrsetvariable __P((struct mem_range_softc *sc,
+					      int *arg);
+int			 i686_mrsetvariable(struct mem_range_softc *sc,
 						   struct mem_range_desc *mrd,
-						   int *arg));
+						   int *arg);
 
 /* i686 MTRR type to memory range type conversion */
 int i686_mtrrtomrt[] = {
diff --git a/sys/arch/i386/i386/k6_mem.c b/sys/arch/i386/i386/k6_mem.c
index d16ee55eeaf..9266bd30308 100644
--- a/sys/arch/i386/i386/k6_mem.c
+++ b/sys/arch/i386/i386/k6_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: k6_mem.c,v 1.4 2000/03/22 00:02:12 deraadt Exp $ */
+/* $OpenBSD: k6_mem.c,v 1.5 2002/03/14 01:26:32 millert Exp $ */
 /*-
  * Copyright (c) 1999 Brian Fundakowski Feldman
  * All rights reserved.
@@ -67,9 +67,9 @@
 #define k6_reg_make(addr, mask, wc, uc) 				\
 		((addr) | ((mask) << 2) | ((wc) << 1) | uc)
 
-void k6_mrinit __P((struct mem_range_softc *sc));
-int k6_mrset __P((struct mem_range_softc *, struct mem_range_desc *, int *));
-__inline int k6_mrmake __P((struct mem_range_desc *, u_int32_t *));
+void k6_mrinit(struct mem_range_softc *sc);
+int k6_mrset(struct mem_range_softc *, struct mem_range_desc *, int *);
+__inline int k6_mrmake(struct mem_range_desc *, u_int32_t *);
 
 struct mem_range_ops k6_mrops = {
 	k6_mrinit,
diff --git a/sys/arch/i386/i386/linux_machdep.c b/sys/arch/i386/i386/linux_machdep.c
index 57dd6222d88..b0313c0914c 100644
--- a/sys/arch/i386/i386/linux_machdep.c
+++ b/sys/arch/i386/i386/linux_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_machdep.c,v 1.20 2002/02/13 20:43:42 jasoni Exp $	*/
+/*	$OpenBSD: linux_machdep.c,v 1.21 2002/03/14 01:26:32 millert Exp $	*/
 /*	$NetBSD: linux_machdep.c,v 1.29 1996/05/03 19:42:11 christos Exp $	*/
 
 /*
@@ -80,10 +80,10 @@
 
 #ifdef USER_LDT
 #include <machine/cpu.h>
-int linux_read_ldt __P((struct proc *, struct linux_sys_modify_ldt_args *,
-    register_t *));
-int linux_write_ldt __P((struct proc *, struct linux_sys_modify_ldt_args *,
-    register_t *));
+int linux_read_ldt(struct proc *, struct linux_sys_modify_ldt_args *,
+    register_t *);
+int linux_write_ldt(struct proc *, struct linux_sys_modify_ldt_args *,
+    register_t *);
 #endif
 
 /*
@@ -454,7 +454,7 @@ linux_machdepioctl(p, v, retval)
 	struct filedesc *fdp;
 	struct file *fp;
 	int fd;
-	int (*ioctlf) __P((struct file *, u_long, caddr_t, struct proc *));
+	int (*ioctlf)(struct file *, u_long, caddr_t, struct proc *);
 	struct ioctl_pt pt;
 
 	fd = SCARG(uap, fd);
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 9773b403d34..b035da2e2da 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.197 2002/02/17 22:59:52 maja Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.198 2002/03/14 01:26:32 millert Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -270,18 +270,18 @@ struct	extent *ioport_ex;
 struct	extent *iomem_ex;
 static	int ioport_malloc_safe;
 
-caddr_t	allocsys __P((caddr_t));
-void	setup_buffers __P((vm_offset_t *));
-void	dumpsys __P((void));
-int	cpu_dump __P((void));
-void	identifycpu __P((void));
-void	init386 __P((vm_offset_t));
-void	consinit __P((void));
+caddr_t	allocsys(caddr_t);
+void	setup_buffers(vm_offset_t *);
+void	dumpsys(void);
+int	cpu_dump(void);
+void	identifycpu(void);
+void	init386(vm_offset_t);
+void	consinit(void);
 
-int	bus_mem_add_mapping __P((bus_addr_t, bus_size_t,
-	    int, bus_space_handle_t *));
-int	_bus_dmamap_load_buffer __P((bus_dma_tag_t, bus_dmamap_t, void *,
-    bus_size_t, struct proc *, int, paddr_t *, int *, int));
+int	bus_mem_add_mapping(bus_addr_t, bus_size_t,
+	    int, bus_space_handle_t *);
+int	_bus_dmamap_load_buffer(bus_dma_tag_t, bus_dmamap_t, void *,
+    bus_size_t, struct proc *, int, paddr_t *, int *, int);
 
 #ifdef KGDB
 #ifndef KGDB_DEVNAME
@@ -306,7 +306,7 @@ int comkgdbrate = KGDBRATE;
 #endif
 int comkgdbmode = KGDBMODE;
 #endif /* NCOM  || NPCCOM */
-void kgdb_port_init __P((void));
+void kgdb_port_init(void);
 #endif /* KGDB */
 
 #ifdef APERTURE
@@ -317,12 +317,12 @@ int allowaperture = 0;
 #endif
 #endif
 
-void	winchip_cpu_setup __P((const char *, int, int));
-void	cyrix3_cpu_setup __P((const char *, int, int));
-void	cyrix6x86_cpu_setup __P((const char *, int, int));
-void	intel586_cpu_setup __P((const char *, int, int));
-void	intel686_cpu_setup __P((const char *, int, int));
-char *	intel686_cpu_name __P((int));
+void	winchip_cpu_setup(const char *, int, int);
+void	cyrix3_cpu_setup(const char *, int, int);
+void	cyrix6x86_cpu_setup(const char *, int, int);
+void	intel586_cpu_setup(const char *, int, int);
+void	intel686_cpu_setup(const char *, int, int);
+char *	intel686_cpu_name(int);
 
 #if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
 static __inline u_char
@@ -1145,7 +1145,7 @@ identifycpu()
 	int class = CPUCLASS_386, vendor, i, max;
 	int family, model, step, modif, cachesize;
 	const struct cpu_cpuid_nameclass *cpup = NULL;
-	void (*cpu_setup) __P((const char *, int, int));
+	void (*cpu_setup)(const char *, int, int);
 
 	if (cpuid_level == -1) {
 #ifdef DIAGNOSTIC
@@ -1353,7 +1353,7 @@ identifycpu()
 }
 
 #ifdef COMPAT_IBCS2
-void ibcs2_sendsig __P((sig_t, int, int, u_long, int, union sigval));
+void ibcs2_sendsig(sig_t, int, int, u_long, int, union sigval);
 
 void
 ibcs2_sendsig(catcher, sig, mask, code, type, val)
@@ -1703,7 +1703,7 @@ dumpconf()
 int
 cpu_dump()
 {
-	int (*dump) __P((dev_t, daddr_t, caddr_t, size_t));
+	int (*dump)(dev_t, daddr_t, caddr_t, size_t);
 	long buf[dbtob(1) / sizeof (long)];
 	kcore_seg_t	*segp;
 
@@ -1742,7 +1742,7 @@ dumpsys()
 	register u_int i, j, npg;
 	register int maddr;
 	daddr_t blkno;
-	int (*dump) __P((dev_t, daddr_t, caddr_t, size_t));
+	int (*dump)(dev_t, daddr_t, caddr_t, size_t);
 	int error;
 	register char *str;
 	extern int msgbufmapped;
diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c
index fa2e12c0f6c..47577e0a0b9 100644
--- a/sys/arch/i386/i386/mainbus.c
+++ b/sys/arch/i386/i386/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.14 1999/02/19 17:32:39 art Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.15 2002/03/14 01:26:32 millert Exp $	*/
 /*	$NetBSD: mainbus.c,v 1.21 1997/06/06 23:14:20 thorpej Exp $	*/
 
 /*
@@ -54,8 +54,8 @@
 #include <machine/biosvar.h>
 #endif
 
-int	mainbus_match __P((struct device *, void *, void *));
-void	mainbus_attach __P((struct device *, struct device *, void *));
+int	mainbus_match(struct device *, void *, void *);
+void	mainbus_attach(struct device *, struct device *, void *);
 
 struct cfattach mainbus_ca = {
 	sizeof(struct device), mainbus_match, mainbus_attach
@@ -65,7 +65,7 @@ struct cfdriver mainbus_cd = {
 	NULL, "mainbus", DV_DULL
 };
 
-int	mainbus_print __P((void *, const char *));
+int	mainbus_print(void *, const char *);
 
 union mainbus_attach_args {
 	const char *mba_busname;		/* first elem of all */
diff --git a/sys/arch/i386/i386/mem.c b/sys/arch/i386/i386/mem.c
index 5f258217f64..478a0931d4e 100644
--- a/sys/arch/i386/i386/mem.c
+++ b/sys/arch/i386/i386/mem.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: mem.c,v 1.31 1996/05/03 19:42:19 christos Exp $	*/
-/*	$OpenBSD: mem.c,v 1.22 2001/12/08 02:24:06 art Exp $ */
+/*	$OpenBSD: mem.c,v 1.23 2002/03/14 01:26:32 millert Exp $ */
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -75,7 +75,7 @@ extern int allowaperture;
 
 #if NMTRR > 0
 struct mem_range_softc mem_range_softc;
-static int mem_ioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
+static int mem_ioctl(dev_t, u_long, caddr_t, int, struct proc *);
 #endif
 
 /*ARGSUSED*/
diff --git a/sys/arch/i386/i386/mtrr.c b/sys/arch/i386/i386/mtrr.c
index 99479bd73b9..b786be81ae5 100644
--- a/sys/arch/i386/i386/mtrr.c
+++ b/sys/arch/i386/i386/mtrr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mtrr.c,v 1.5 2001/07/04 23:52:41 espie Exp $ */
+/* $OpenBSD: mtrr.c,v 1.6 2002/03/14 01:26:32 millert Exp $ */
 /*-
  * Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
  * Copyright (c) 1999 Brian Fundakowski Feldman
@@ -41,7 +41,7 @@ extern char cpu_vendor[];
 extern struct mem_range_ops i686_mrops;
 extern struct mem_range_ops k6_mrops;
 
-void mtrrattach __P((int));
+void mtrrattach(int);
 
 void
 mtrrattach (num)
diff --git a/sys/arch/i386/i386/pctr.c b/sys/arch/i386/i386/pctr.c
index c3c7d95516e..72c2122af30 100644
--- a/sys/arch/i386/i386/pctr.c
+++ b/sys/arch/i386/i386/pctr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pctr.c,v 1.14 2001/06/05 05:05:38 pvalchev Exp $	*/
+/*	$OpenBSD: pctr.c,v 1.15 2002/03/14 01:26:32 millert Exp $	*/
 
 /*
  * Pentium performance counter driver for OpenBSD.
@@ -35,14 +35,14 @@ int pctr_isintel;
 				(((cpu_id >> 4) & 15) > 0))
 #define usep6ctr	(pctr_isintel && ((cpu_id >> 8) & 15) == 6)
 
-void pctrattach __P((int));
-int pctropen __P((dev_t, int, int, struct proc *));
-int pctrclose __P((dev_t, int, int, struct proc *));
-int pctrioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
-int p5ctrsel __P((int fflag, u_int cmd, u_int fn));
-static __inline void p5ctrrd __P((struct pctrst *st));
-int p6ctrsel __P((int fflag, u_int cmd, u_int fn));
-static __inline void p6ctrrd __P((struct pctrst *st));
+void pctrattach(int);
+int pctropen(dev_t, int, int, struct proc *);
+int pctrclose(dev_t, int, int, struct proc *);
+int pctrioctl(dev_t, u_long, caddr_t, int, struct proc *);
+int p5ctrsel(int fflag, u_int cmd, u_int fn);
+static __inline void p5ctrrd(struct pctrst *st);
+int p6ctrsel(int fflag, u_int cmd, u_int fn);
+static __inline void p6ctrrd(struct pctrst *st);
 
 void
 pctrattach (num)
diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c
index d9c5df4b464..1e5b9a09796 100644
--- a/sys/arch/i386/i386/pmap.c
+++ b/sys/arch/i386/i386/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.58 2002/01/23 00:39:47 art Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.59 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pmap.c,v 1.91 2000/06/02 17:46:37 thorpej Exp $	*/
 
 /*
@@ -373,49 +373,49 @@ extern vaddr_t pentium_idt_vaddr;
  * local prototypes
  */
 
-static struct pv_entry	*pmap_add_pvpage __P((struct pv_page *, boolean_t));
-static struct vm_page	*pmap_alloc_ptp __P((struct pmap *, int, boolean_t));
-static struct pv_entry	*pmap_alloc_pv __P((struct pmap *, int)); /* see codes below */
+static struct pv_entry	*pmap_add_pvpage(struct pv_page *, boolean_t);
+static struct vm_page	*pmap_alloc_ptp(struct pmap *, int, boolean_t);
+static struct pv_entry	*pmap_alloc_pv(struct pmap *, int); /* see codes below */
 #define ALLOCPV_NEED	0	/* need PV now */
 #define ALLOCPV_TRY	1	/* just try to allocate, don't steal */
 #define ALLOCPV_NONEED	2	/* don't need PV, just growing cache */
-static struct pv_entry	*pmap_alloc_pvpage __P((struct pmap *, int));
-static void		 pmap_enter_pv __P((struct pv_head *,
+static struct pv_entry	*pmap_alloc_pvpage(struct pmap *, int);
+static void		 pmap_enter_pv(struct pv_head *,
 					    struct pv_entry *, struct pmap *,
-					    vaddr_t, struct vm_page *));
-static void		 pmap_free_pv __P((struct pmap *, struct pv_entry *));
-static void		 pmap_free_pvs __P((struct pmap *, struct pv_entry *));
-static void		 pmap_free_pv_doit __P((struct pv_entry *));
-static void		 pmap_free_pvpage __P((void));
-static struct vm_page	*pmap_get_ptp __P((struct pmap *, int, boolean_t));
-static boolean_t	 pmap_is_curpmap __P((struct pmap *));
-static pt_entry_t	*pmap_map_ptes __P((struct pmap *));
-static struct pv_entry	*pmap_remove_pv __P((struct pv_head *, struct pmap *,
-					     vaddr_t));
-static boolean_t	 pmap_remove_pte __P((struct pmap *, struct vm_page *,
-					      pt_entry_t *, vaddr_t));
-static void		 pmap_remove_ptes __P((struct pmap *,
+					    vaddr_t, struct vm_page *);
+static void		 pmap_free_pv(struct pmap *, struct pv_entry *);
+static void		 pmap_free_pvs(struct pmap *, struct pv_entry *);
+static void		 pmap_free_pv_doit(struct pv_entry *);
+static void		 pmap_free_pvpage(void);
+static struct vm_page	*pmap_get_ptp(struct pmap *, int, boolean_t);
+static boolean_t	 pmap_is_curpmap(struct pmap *);
+static pt_entry_t	*pmap_map_ptes(struct pmap *);
+static struct pv_entry	*pmap_remove_pv(struct pv_head *, struct pmap *,
+					     vaddr_t);
+static boolean_t	 pmap_remove_pte(struct pmap *, struct vm_page *,
+					      pt_entry_t *, vaddr_t);
+static void		 pmap_remove_ptes(struct pmap *,
 					       struct pmap_remove_record *,
 					       struct vm_page *, vaddr_t,
-					       vaddr_t, vaddr_t));
-static struct vm_page	*pmap_steal_ptp __P((struct uvm_object *,
-					     vaddr_t));
-static vaddr_t		 pmap_tmpmap_pa __P((paddr_t));
-static pt_entry_t	*pmap_tmpmap_pvepte __P((struct pv_entry *));
-static void		 pmap_tmpunmap_pa __P((void));
-static void		 pmap_tmpunmap_pvepte __P((struct pv_entry *));
-static boolean_t	 pmap_transfer_ptes __P((struct pmap *,
+					       vaddr_t, vaddr_t);
+static struct vm_page	*pmap_steal_ptp(struct uvm_object *,
+					     vaddr_t);
+static vaddr_t		 pmap_tmpmap_pa(paddr_t);
+static pt_entry_t	*pmap_tmpmap_pvepte(struct pv_entry *);
+static void		 pmap_tmpunmap_pa(void);
+static void		 pmap_tmpunmap_pvepte(struct pv_entry *);
+static boolean_t	 pmap_transfer_ptes(struct pmap *,
 					 struct pmap_transfer_location *,
 					 struct pmap *,
 					 struct pmap_transfer_location *,
-					 int, boolean_t));
-static boolean_t	 pmap_try_steal_pv __P((struct pv_head *,
+					 int, boolean_t);
+static boolean_t	 pmap_try_steal_pv(struct pv_head *,
 						struct pv_entry *,
-						struct pv_entry *));
-static void		pmap_unmap_ptes __P((struct pmap *));
+						struct pv_entry *);
+static void		pmap_unmap_ptes(struct pmap *);
 
-void			pmap_pinit __P((pmap_t));
-void			pmap_release __P((pmap_t));
+void			pmap_pinit(pmap_t);
+void			pmap_release(pmap_t);
 
 /*
  * p m a p   i n l i n e   h e l p e r   f u n c t i o n s
@@ -3625,7 +3625,7 @@ out:
 }
 
 #ifdef DEBUG
-void pmap_dump __P((struct pmap *, vaddr_t, vaddr_t));
+void pmap_dump(struct pmap *, vaddr_t, vaddr_t);
 
 /*
  * pmap_dump: dump all the mappings from a pmap
diff --git a/sys/arch/i386/i386/process_machdep.c b/sys/arch/i386/i386/process_machdep.c
index 7897ee4bf8c..c4148f27494 100644
--- a/sys/arch/i386/i386/process_machdep.c
+++ b/sys/arch/i386/i386/process_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process_machdep.c,v 1.9 2002/03/14 00:42:24 miod Exp $	*/
+/*	$OpenBSD: process_machdep.c,v 1.10 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: process_machdep.c,v 1.22 1996/05/03 19:42:25 christos Exp $	*/
 
 /*
@@ -81,8 +81,8 @@
 #include <machine/vm86.h>
 #endif
 
-static __inline struct trapframe *process_frame __P((struct proc *));
-static __inline struct save87 *process_fpframe __P((struct proc *));
+static __inline struct trapframe *process_frame(struct proc *);
+static __inline struct save87 *process_fpframe(struct proc *);
 
 static __inline struct trapframe *
 process_frame(p)
diff --git a/sys/arch/i386/i386/svr4_machdep.c b/sys/arch/i386/i386/svr4_machdep.c
index 7c5bde75890..7ed6edcc7a7 100644
--- a/sys/arch/i386/i386/svr4_machdep.c
+++ b/sys/arch/i386/i386/svr4_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svr4_machdep.c,v 1.14 1997/09/12 23:17:54 martin Exp $	*/
+/*	$OpenBSD: svr4_machdep.c,v 1.15 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: svr4_machdep.c,v 1.24 1996/05/03 19:42:26 christos Exp $	 */
 
 /*
@@ -56,7 +56,7 @@
 #include <machine/vm86.h>
 #include <machine/svr4_machdep.h>
 
-static void svr4_getsiginfo __P((union svr4_siginfo *, int, u_long, int, caddr_t));
+static void svr4_getsiginfo(union svr4_siginfo *, int, u_long, int, caddr_t);
 
 void
 svr4_getcontext(p, uc, mask, oonstack)
diff --git a/sys/arch/i386/i386/swapgeneric.c b/sys/arch/i386/i386/swapgeneric.c
index eb3fa21ba4b..8c9192c3e96 100644
--- a/sys/arch/i386/i386/swapgeneric.c
+++ b/sys/arch/i386/i386/swapgeneric.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: swapgeneric.c,v 1.11 2001/09/29 18:40:32 miod Exp $	*/
+/*	$OpenBSD: swapgeneric.c,v 1.12 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: swapgeneric.c,v 1.12 1996/05/03 19:42:28 christos Exp $	*/
 
 /*-
@@ -46,7 +46,7 @@
 #include <sys/param.h>
 #include <sys/conf.h>
 
-int (*mountroot) __P((void)) = NULL;
+int (*mountroot)(void) = NULL;
 
 dev_t	rootdev = NODEV;
 dev_t	dumpdev = NODEV;
diff --git a/sys/arch/i386/i386/sys_machdep.c b/sys/arch/i386/i386/sys_machdep.c
index 6aa7063898c..fec9478d381 100644
--- a/sys/arch/i386/i386/sys_machdep.c
+++ b/sys/arch/i386/i386/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.17 2001/11/28 16:13:28 art Exp $	*/
+/*	$OpenBSD: sys_machdep.c,v 1.18 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: sys_machdep.c,v 1.28 1996/05/03 19:42:29 christos Exp $	*/
 
 /*-
@@ -73,12 +73,12 @@
 extern struct vm_map *kernel_map;
 
 #ifdef USER_LDT
-int i386_get_ldt __P((struct proc *, void *, register_t *));
-int i386_set_ldt __P((struct proc *, void *, register_t *));
+int i386_get_ldt(struct proc *, void *, register_t *);
+int i386_set_ldt(struct proc *, void *, register_t *);
 #endif
-int i386_iopl __P((struct proc *, void *, register_t *));
-int i386_get_ioperm __P((struct proc *, void *, register_t *));
-int i386_set_ioperm __P((struct proc *, void *, register_t *));
+int i386_iopl(struct proc *, void *, register_t *);
+int i386_get_ioperm(struct proc *, void *, register_t *);
+int i386_set_ioperm(struct proc *, void *, register_t *);
 
 #ifdef USER_LDT
 /*
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c
index 53a47290602..83c315a24cd 100644
--- a/sys/arch/i386/i386/trap.c
+++ b/sys/arch/i386/i386/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.48 2002/02/21 23:27:12 deraadt Exp $	*/
+/*	$OpenBSD: trap.c,v 1.49 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $	*/
 
 /*-
@@ -91,10 +91,10 @@ extern struct emul emul_bsdos;
 
 #include "npx.h"
 
-static __inline void userret __P((struct proc *, int, u_quad_t));
-void trap __P((struct trapframe));
-int trapwrite __P((unsigned));
-void syscall __P((struct trapframe));
+static __inline void userret(struct proc *, int, u_quad_t);
+void trap(struct trapframe);
+int trapwrite(unsigned);
+void syscall(struct trapframe);
 
 /*
  * Define the code needed before returning to user mode, for
diff --git a/sys/arch/i386/i386/vm86.c b/sys/arch/i386/i386/vm86.c
index 19aa6c9e886..4bf4911debe 100644
--- a/sys/arch/i386/i386/vm86.c
+++ b/sys/arch/i386/i386/vm86.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm86.c,v 1.13 2002/01/16 20:50:16 miod Exp $	*/
+/*	$OpenBSD: vm86.c,v 1.14 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: vm86.c,v 1.15 1996/05/03 19:42:33 christos Exp $	*/
 
 /*-
@@ -70,8 +70,8 @@
 #include <machine/sysarch.h>
 #include <machine/vm86.h>
 
-static void fast_intxx __P((struct proc *, int));
-static __inline int is_bitset __P((int, caddr_t));
+static void fast_intxx(struct proc *, int);
+static __inline int is_bitset(int, caddr_t);
 
 #define	CS(tf)		(*(u_short *)&tf->tf_cs)
 #define	IP(tf)		(*(u_short *)&tf->tf_eip)
diff --git a/sys/arch/i386/i386/wscons_machdep.c b/sys/arch/i386/i386/wscons_machdep.c
index 91f2163882f..3bc50e979ae 100644
--- a/sys/arch/i386/i386/wscons_machdep.c
+++ b/sys/arch/i386/i386/wscons_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wscons_machdep.c,v 1.7 2001/07/29 23:13:28 csapuntz Exp $ */
+/*	$OpenBSD: wscons_machdep.c,v 1.8 2002/03/14 01:26:33 millert Exp $ */
 
 /*
  * Copyright (c) 2001 Aaron Campbell
@@ -85,11 +85,11 @@
 #include <machine/pccons.h>
 #endif
 
-void wscnprobe __P((struct consdev *));
-void wscninit __P((struct consdev *));
-void wscnputc __P((dev_t, char));
-int wscngetc __P((dev_t));
-void wscnpollc __P((dev_t, int));
+void wscnprobe(struct consdev *);
+void wscninit(struct consdev *);
+void wscnputc(dev_t, char);
+int wscngetc(dev_t);
+void wscnpollc(dev_t, int);
 
 void
 wscnprobe(cp)
diff --git a/sys/arch/i386/include/apmvar.h b/sys/arch/i386/include/apmvar.h
index 1703c833ac1..f2c1aaf41dc 100644
--- a/sys/arch/i386/include/apmvar.h
+++ b/sys/arch/i386/include/apmvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apmvar.h,v 1.14 2001/12/14 17:07:40 mickey Exp $	*/
+/*	$OpenBSD: apmvar.h,v 1.15 2002/03/14 01:26:33 millert Exp $	*/
 
 /*
  *  Copyright (c) 1995 John T. Kohl
@@ -289,11 +289,11 @@ struct apm_ctl {
 					   if the percentage changes */
 
 #ifdef _KERNEL
-extern void apm_cpu_busy __P((void));
-extern void apm_cpu_idle __P((void));
-extern void apminit __P((void));
-int apm_set_powstate __P((u_int devid, u_int powstate));
-int apm_kqfilter __P((dev_t dev, struct knote *kn));
+extern void apm_cpu_busy(void);
+extern void apm_cpu_idle(void);
+extern void apminit(void);
+int apm_set_powstate(u_int devid, u_int powstate);
+int apm_kqfilter(dev_t dev, struct knote *kn);
 #endif /* _KERNEL */
 
 #endif /* _I386_APMVAR_H_ */
diff --git a/sys/arch/i386/include/biosvar.h b/sys/arch/i386/include/biosvar.h
index a7b5bf5b68c..f27db7a95e0 100644
--- a/sys/arch/i386/include/biosvar.h
+++ b/sys/arch/i386/include/biosvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosvar.h,v 1.39 2002/02/21 18:38:44 tdeval Exp $	*/
+/*	$OpenBSD: biosvar.h,v 1.40 2002/03/14 01:26:33 millert Exp $	*/
 
 /*
  * Copyright (c) 1997-1999 Michael Shalayeff
@@ -235,18 +235,17 @@ struct bios_attach_args {
 struct consdev;
 struct proc;
 
-int bios_sysctl
-	__P((int *, u_int, void *, size_t *, void *, size_t, struct proc *));
+int bios_sysctl(int *, u_int, void *, size_t *, void *, size_t, struct proc *);
 
-void bioscnprobe __P((struct consdev *));
-void bioscninit __P((struct consdev *));
-void bioscnputc __P((dev_t, int));
-int bioscngetc __P((dev_t));
-void bioscnpollc __P((dev_t, int));
-void bios_getopt __P((void));
+void bioscnprobe(struct consdev *);
+void bioscninit(struct consdev *);
+void bioscnputc(dev_t, int);
+int bioscngetc(dev_t);
+void bioscnpollc(dev_t, int);
+void bios_getopt(void);
 
 /* bios32.c */
-int  bios32_service __P((u_int32_t, bios32_entry_t, bios32_entry_info_t));
+int  bios32_service(u_int32_t, bios32_entry_t, bios32_entry_info_t);
 
 extern u_int bootapiver;
 extern bios_memmap_t *bios_memmap;
diff --git a/sys/arch/i386/include/bus.h b/sys/arch/i386/include/bus.h
index 3ac591f0149..7ab5bc7ef48 100644
--- a/sys/arch/i386/include/bus.h
+++ b/sys/arch/i386/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.32 2002/03/07 18:08:08 jason Exp $	*/
+/*	$OpenBSD: bus.h,v 1.33 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $	*/
 
 /*-
@@ -93,26 +93,26 @@ typedef u_long bus_size_t;
 typedef	int bus_space_tag_t;
 typedef	u_long bus_space_handle_t;
 
-int	bus_space_map __P((bus_space_tag_t t, bus_addr_t addr,
-	    bus_size_t size, int cacheable, bus_space_handle_t *bshp));
+int	bus_space_map(bus_space_tag_t t, bus_addr_t addr,
+	    bus_size_t size, int cacheable, bus_space_handle_t *bshp);
 /* like bus_space_map(), but without extent map checking/allocation */
-int	_bus_space_map __P((bus_space_tag_t t, bus_addr_t addr,
-	    bus_size_t size, int cacheable, bus_space_handle_t *bshp));
-void	bus_space_unmap __P((bus_space_tag_t t, bus_space_handle_t bsh,
-	    bus_size_t size));
-int	bus_space_subregion __P((bus_space_tag_t t, bus_space_handle_t bsh,
-	    bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp));
-
-int	bus_space_alloc __P((bus_space_tag_t t, bus_addr_t rstart,
+int	_bus_space_map(bus_space_tag_t t, bus_addr_t addr,
+	    bus_size_t size, int cacheable, bus_space_handle_t *bshp);
+void	bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh,
+	    bus_size_t size);
+int	bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh,
+	    bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp);
+
+int	bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart,
 	    bus_addr_t rend, bus_size_t size, bus_size_t align,
 	    bus_size_t boundary, int cacheable, bus_addr_t *addrp,
-	    bus_space_handle_t *bshp));
-void	bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
-	    bus_size_t size));
+	    bus_space_handle_t *bshp);
+void	bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh,
+	    bus_size_t size);
 
 /*
- *	u_intN_t bus_space_read_N __P((bus_space_tag_t tag,
- *	    bus_space_handle_t bsh, bus_size_t offset));
+ *	u_intN_t bus_space_read_N(bus_space_tag_t tag,
+ *	    bus_space_handle_t bsh, bus_size_t offset);
  *
  * Read a 1, 2, 4, or 8 byte quantity from bus space
  * described by tag/handle/offset.
@@ -135,9 +135,9 @@ void	bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_read_multi_N __P((bus_space_tag_t tag,
+ *	void bus_space_read_multi_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    u_intN_t *addr, size_t count));
+ *	    u_intN_t *addr, size_t count);
  *
  * Read `count' 1, 2, 4, or 8 byte quantities from bus space
  * described by tag/handle/offset and copy into buffer provided.
@@ -190,9 +190,9 @@ void	bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_read_raw_multi_N __P((bus_space_tag_t tag,
+ *	void bus_space_read_raw_multi_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    u_int8_t *addr, size_t count));
+ *	    u_int8_t *addr, size_t count);
  *
  * Read `count' bytes in 2, 4 or 8 byte wide quantities from bus space
  * described by tag/handle/offset and copy into buffer provided.  The buffer
@@ -211,9 +211,9 @@ void	bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_read_region_N __P((bus_space_tag_t tag,
+ *	void bus_space_read_region_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    u_intN_t *addr, size_t count));
+ *	    u_intN_t *addr, size_t count);
  *
  * Read `count' 1, 2, 4, or 8 byte quantities from bus space
  * described by tag/handle and starting at `offset' and copy into
@@ -270,9 +270,9 @@ void	bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_read_raw_region_N __P((bus_space_tag_t tag,
+ *	void bus_space_read_raw_region_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    u_int8_t *addr, size_t count));
+ *	    u_int8_t *addr, size_t count);
  *
  * Read `count' bytes in 2, 4 or 8 byte wide quantities from bus space
  * described by tag/handle and starting at `offset' and copy into
@@ -292,9 +292,9 @@ void	bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_write_N __P((bus_space_tag_t tag,
+ *	void bus_space_write_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    u_intN_t value));
+ *	    u_intN_t value);
  *
  * Write the 1, 2, 4, or 8 byte value `value' to bus space
  * described by tag/handle/offset.
@@ -326,9 +326,9 @@ void	bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_write_multi_N __P((bus_space_tag_t tag,
+ *	void bus_space_write_multi_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    const u_intN_t *addr, size_t count));
+ *	    const u_intN_t *addr, size_t count);
  *
  * Write `count' 1, 2, 4, or 8 byte quantities from the buffer
  * provided to bus space described by tag/handle/offset.
@@ -382,9 +382,9 @@ void	bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_write_raw_multi_N __P((bus_space_tag_t tag,
+ *	void bus_space_write_raw_multi_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    const u_int8_t *addr, size_t count));
+ *	    const u_int8_t *addr, size_t count);
  *
  * Write `count' bytes in 2, 4 or 8 byte wide quantities from the buffer
  * provided to bus space described by tag/handle/offset.  The buffer
@@ -403,9 +403,9 @@ void	bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_write_region_N __P((bus_space_tag_t tag,
+ *	void bus_space_write_region_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    const u_intN_t *addr, size_t count));
+ *	    const u_intN_t *addr, size_t count);
  *
  * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided
  * to bus space described by tag/handle starting at `offset'.
@@ -462,9 +462,9 @@ void	bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_write_raw_region_N __P((bus_space_tag_t tag,
+ *	void bus_space_write_raw_region_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    const u_int8_t *addr, size_t count));
+ *	    const u_int8_t *addr, size_t count);
  *
  * Write `count' bytes in 2, 4 or 8 byte wide quantities to bus space
  * described by tag/handle and starting at `offset' from the
@@ -484,9 +484,9 @@ void	bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_set_multi_N __P((bus_space_tag_t tag,
+ *	void bus_space_set_multi_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    u_intN_t val, size_t count));
+ *	    u_intN_t val, size_t count);
  *
  * Write the 1, 2, 4, or 8 byte value `val' to bus space described
  * by tag/handle/offset `count' times.
@@ -555,9 +555,9 @@ void	bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_set_region_N __P((bus_space_tag_t tag,
+ *	void bus_space_set_region_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    u_intN_t val, size_t count));
+ *	    u_intN_t val, size_t count);
  *
  * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
  * by tag/handle starting at `offset'.
@@ -626,10 +626,10 @@ void	bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
 #endif
 
 /*
- *	void bus_space_copy_N __P((bus_space_tag_t tag,
+ *	void bus_space_copy_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh1, bus_size_t off1,
  *	    bus_space_handle_t bsh2, bus_size_t off2,
- *	    size_t count));
+ *	    size_t count);
  *
  * Copy `count' 1, 2, 4, or 8 byte values from bus space starting
  * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
@@ -714,9 +714,9 @@ void	bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
 /*
  * Bus read/write barrier methods.
  *
- *	void bus_space_barrier __P((bus_space_tag_t tag,
+ *	void bus_space_barrier(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    bus_size_t len, int flags));
+ *	    bus_size_t len, int flags);
  *
  * Note: the i386 does not currently require barriers, but we must
  * provide the flags to MI code.
@@ -785,33 +785,33 @@ struct i386_bus_dma_tag {
 	/*
 	 * DMA mapping methods.
 	 */
-	int	(*_dmamap_create) __P((bus_dma_tag_t, bus_size_t, int,
-		    bus_size_t, bus_size_t, int, bus_dmamap_t *));
-	void	(*_dmamap_destroy) __P((bus_dma_tag_t, bus_dmamap_t));
-	int	(*_dmamap_load) __P((bus_dma_tag_t, bus_dmamap_t, void *,
-		    bus_size_t, struct proc *, int));
-	int	(*_dmamap_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t,
-		    struct mbuf *, int));
-	int	(*_dmamap_load_uio) __P((bus_dma_tag_t, bus_dmamap_t,
-		    struct uio *, int));
-	int	(*_dmamap_load_raw) __P((bus_dma_tag_t, bus_dmamap_t,
-		    bus_dma_segment_t *, int, bus_size_t, int));
-	void	(*_dmamap_unload) __P((bus_dma_tag_t, bus_dmamap_t));
-	void	(*_dmamap_sync) __P((bus_dma_tag_t, bus_dmamap_t,
-		    bus_addr_t, bus_size_t, int));
+	int	(*_dmamap_create)(bus_dma_tag_t, bus_size_t, int,
+		    bus_size_t, bus_size_t, int, bus_dmamap_t *);
+	void	(*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t);
+	int	(*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *,
+		    bus_size_t, struct proc *, int);
+	int	(*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t,
+		    struct mbuf *, int);
+	int	(*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t,
+		    struct uio *, int);
+	int	(*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t,
+		    bus_dma_segment_t *, int, bus_size_t, int);
+	void	(*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t);
+	void	(*_dmamap_sync)(bus_dma_tag_t, bus_dmamap_t,
+		    bus_addr_t, bus_size_t, int);
 
 	/*
 	 * DMA memory utility functions.
 	 */
-	int	(*_dmamem_alloc) __P((bus_dma_tag_t, bus_size_t, bus_size_t,
-		    bus_size_t, bus_dma_segment_t *, int, int *, int));
-	void	(*_dmamem_free) __P((bus_dma_tag_t,
-		    bus_dma_segment_t *, int));
-	int	(*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *,
-		    int, size_t, caddr_t *, int));
-	void	(*_dmamem_unmap) __P((bus_dma_tag_t, caddr_t, size_t));
-	paddr_t	(*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *,
-		    int, off_t, int, int));
+	int	(*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t,
+		    bus_size_t, bus_dma_segment_t *, int, int *, int);
+	void	(*_dmamem_free)(bus_dma_tag_t,
+		    bus_dma_segment_t *, int);
+	int	(*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *,
+		    int, size_t, caddr_t *, int);
+	void	(*_dmamem_unmap)(bus_dma_tag_t, caddr_t, size_t);
+	paddr_t	(*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *,
+		    int, off_t, int, int);
 };
 
 #define	bus_dmamap_create(t, s, n, m, b, f, p)			\
@@ -869,37 +869,37 @@ struct i386_bus_dmamap {
 };
 
 #ifdef _I386_BUS_DMA_PRIVATE
-int	_bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t,
-	    bus_size_t, int, bus_dmamap_t *));
-void	_bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t));
-int	_bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
-	    bus_size_t, struct proc *, int));
-int	_bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct mbuf *, int));
-int	_bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct uio *, int));
-int	_bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
-	    bus_dma_segment_t *, int, bus_size_t, int));
-void	_bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t));
-void	_bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
-	    bus_size_t, int));
-
-int	_bus_dmamem_alloc __P((bus_dma_tag_t tag, bus_size_t size,
+int	_bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
+	    bus_size_t, int, bus_dmamap_t *);
+void	_bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
+int	_bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
+	    bus_size_t, struct proc *, int);
+int	_bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
+	    struct mbuf *, int);
+int	_bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
+	    struct uio *, int);
+int	_bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
+	    bus_dma_segment_t *, int, bus_size_t, int);
+void	_bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+void	_bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
+	    bus_size_t, int);
+
+int	_bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size,
 	    bus_size_t alignment, bus_size_t boundary,
-	    bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags));
-void	_bus_dmamem_free __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
-	    int nsegs));
-int	_bus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
-	    int nsegs, size_t size, caddr_t *kvap, int flags));
-void	_bus_dmamem_unmap __P((bus_dma_tag_t tag, caddr_t kva,
-	    size_t size));
-paddr_t	_bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
-	    int nsegs, off_t off, int prot, int flags));
-
-int	_bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size,
+	    bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags);
+void	_bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+	    int nsegs);
+int	_bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+	    int nsegs, size_t size, caddr_t *kvap, int flags);
+void	_bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva,
+	    size_t size);
+paddr_t	_bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+	    int nsegs, off_t off, int prot, int flags);
+
+int	_bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
 	    bus_size_t alignment, bus_size_t boundary,
 	    bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
-	    vm_offset_t low, vm_offset_t high));
+	    vm_offset_t low, vm_offset_t high);
 #endif /* _I386_BUS_DMA_PRIVATE */
 
 #endif /* _I386_BUS_H_ */
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index 0aac93264fb..aa413239594 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.40 2001/12/08 02:24:06 art Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.41 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $	*/
 
 /*-
@@ -93,13 +93,13 @@ int	want_resched;		/* resched() was called */
  * We need a machine-independent name for this.
  */
 #define	DELAY(x)		delay(x)
-void	delay __P((int));
+void	delay(int);
 
 #if defined(I586_CPU) || defined(I686_CPU)
 /*
  * High resolution clock support (Pentium only)
  */
-void	calibrate_cyclecounter __P((void));
+void	calibrate_cyclecounter(void);
 #ifndef	HZ
 extern u_quad_t pentium_base_tsc;
 #define CPU_CLOCKUPDATE(otime, ntime)					\
@@ -134,7 +134,7 @@ struct cpu_nocpuid_nameclass {
 	const char *cpu_vendorname;
 	const char *cpu_name;
 	int cpu_class;
-	void (*cpu_setup) __P((const char *, int, int));
+	void (*cpu_setup)(const char *, int, int);
 };
 
 struct cpu_cpuid_nameclass {
@@ -144,7 +144,7 @@ struct cpu_cpuid_nameclass {
 	struct cpu_cpuid_family {
 		int cpu_class;
 		const char *cpu_models[CPU_MAXMODEL+2];
-		void (*cpu_setup) __P((const char *, int, int));
+		void (*cpu_setup)(const char *, int, int);
 	} cpu_family[CPU_MAXFAMILY - CPU_MINFAMILY + 1];
 };
 
@@ -170,68 +170,68 @@ extern int pentium_mhz;
 #ifdef I586_CPU
 /* F00F bug fix stuff for pentium cpu */
 extern int cpu_f00f_bug;
-void fix_f00f __P((void));
+void fix_f00f(void);
 #endif
 
 /* dkcsum.c */
-void	dkcsumattach __P((void));
+void	dkcsumattach(void);
 
 /* machdep.c */
-void	dumpconf __P((void));
-void	cpu_reset __P((void));
-void	i386_proc0_tss_ldt_init __P((void));
+void	dumpconf(void);
+void	cpu_reset(void);
+void	i386_proc0_tss_ldt_init(void);
 
 /* locore.s */
 struct region_descriptor;
-void	lgdt __P((struct region_descriptor *));
-void	fillw __P((short, void *, size_t));
-short	fusword __P((u_short *));
-int	susword __P((u_short *t, u_short));
+void	lgdt(struct region_descriptor *);
+void	fillw(short, void *, size_t);
+short	fusword(u_short *);
+int	susword(u_short *t, u_short);
 
 struct pcb;
-void	savectx __P((struct pcb *));
-void	switch_exit __P((struct proc *));
-void	proc_trampoline __P((void));
+void	savectx(struct pcb *);
+void	switch_exit(struct proc *);
+void	proc_trampoline(void);
 
 /* clock.c */
-void	initrtclock __P((void));
-void	startrtclock __P((void));
-void	rtcdrain __P((void *));
+void	initrtclock(void);
+void	startrtclock(void);
+void	rtcdrain(void *);
 
 /* npx.c */
-void	npxdrop __P((void));
-void	npxsave __P((void));
+void	npxdrop(void);
+void	npxsave(void);
 
 #if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE)
 /* math_emulate.c */
-int	math_emulate __P((struct trapframe *));
+int	math_emulate(struct trapframe *);
 #endif
 
 #ifdef USER_LDT
 /* sys_machdep.h */
-void	i386_user_cleanup __P((struct pcb *));
-int	i386_get_ldt __P((struct proc *, void *, register_t *));
-int	i386_set_ldt __P((struct proc *, void *, register_t *));
+void	i386_user_cleanup(struct pcb *);
+int	i386_get_ldt(struct proc *, void *, register_t *);
+int	i386_set_ldt(struct proc *, void *, register_t *);
 #endif
 
 /* isa_machdep.c */
-void	isa_defaultirq __P((void));
-int	isa_nmi __P((void));
+void	isa_defaultirq(void);
+int	isa_nmi(void);
 
 /* pmap.c */
-void	pmap_bootstrap __P((vm_offset_t));
+void	pmap_bootstrap(vm_offset_t);
 
 /* vm_machdep.c */
-int	kvtop __P((caddr_t));
+int	kvtop(caddr_t);
 
 #ifdef VM86
 /* vm86.c */
-void	vm86_gpfault __P((struct proc *, int));
+void	vm86_gpfault(struct proc *, int);
 #endif /* VM86 */
 
 #ifdef GENERIC
 /* swapgeneric.c */
-void	setconf __P((void));
+void	setconf(void);
 #endif /* GENERIC */
 
 #endif /* _KERNEL */
diff --git a/sys/arch/i386/include/cpufunc.h b/sys/arch/i386/include/cpufunc.h
index ffe750332ad..b7c039ab585 100644
--- a/sys/arch/i386/include/cpufunc.h
+++ b/sys/arch/i386/include/cpufunc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpufunc.h,v 1.7 2001/08/18 20:37:42 espie Exp $	*/
+/*	$OpenBSD: cpufunc.h,v 1.8 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: cpufunc.h,v 1.8 1994/10/27 04:15:59 cgd Exp $	*/
 
 /*
@@ -41,24 +41,24 @@
 #include <sys/cdefs.h>
 #include <sys/types.h>
 
-static __inline void invlpg __P((u_int));
-static __inline void lidt __P((void *));
-static __inline void lldt __P((u_short));
-static __inline void ltr __P((u_short));
-static __inline void lcr0 __P((u_int));
-static __inline u_int rcr0 __P((void));
-static __inline u_int rcr2 __P((void));
-static __inline void lcr3 __P((u_int));
-static __inline u_int rcr3 __P((void));
-static __inline void lcr4 __P((u_int));
-static __inline u_int rcr4 __P((void));
-static __inline void tlbflush __P((void));
-static __inline void disable_intr __P((void));
-static __inline void enable_intr __P((void));
-static __inline void wbinvd __P((void));
-static __inline void wrmsr __P((u_int, u_int64_t));
-static __inline u_int64_t rdmsr __P((u_int));
-static __inline void breakpoint __P((void));
+static __inline void invlpg(u_int);
+static __inline void lidt(void *);
+static __inline void lldt(u_short);
+static __inline void ltr(u_short);
+static __inline void lcr0(u_int);
+static __inline u_int rcr0(void);
+static __inline u_int rcr2(void);
+static __inline void lcr3(u_int);
+static __inline u_int rcr3(void);
+static __inline void lcr4(u_int);
+static __inline u_int rcr4(void);
+static __inline void tlbflush(void);
+static __inline void disable_intr(void);
+static __inline void enable_intr(void);
+static __inline void wbinvd(void);
+static __inline void wrmsr(u_int, u_int64_t);
+static __inline u_int64_t rdmsr(u_int);
+static __inline void breakpoint(void);
 
 static __inline void 
 invlpg(u_int addr)
@@ -143,7 +143,7 @@ tlbflush(void)
 }
 
 #ifdef notyet
-void	setidt	__P((int idx, /*XXX*/caddr_t func, int typ, int dpl));
+void	setidt(int idx, /*XXX*/caddr_t func, int typ, int dpl);
 #endif
 
 
diff --git a/sys/arch/i386/include/db_machdep.h b/sys/arch/i386/include/db_machdep.h
index ee32ef6556d..a95248af211 100644
--- a/sys/arch/i386/include/db_machdep.h
+++ b/sys/arch/i386/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.6 2001/11/06 19:53:14 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.7 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.9 1996/05/03 19:23:59 christos Exp $	*/
 
 /* 
@@ -87,8 +87,8 @@ db_regs_t	ddb_regs;	/* register state */
 	 ((user) && (addr) < VM_MAX_ADDRESS))
 
 #if 0
-boolean_t 	db_check_access __P((vaddr_t, int, task_t));
-boolean_t	db_phys_eq __P((task_t, vaddr_t, task_t, vaddr_t));
+boolean_t 	db_check_access(vaddr_t, int, task_t);
+boolean_t	db_phys_eq(task_t, vaddr_t, task_t, vaddr_t);
 #endif
 
 /* macros for printing OS server dependent task name */
@@ -113,6 +113,6 @@ void		db_task_name(/* task_t */);
 
 #define db_thread_fp_used(thread)	((thread)->pcb->ims.ifps != 0)
 
-int kdb_trap __P((int, int, db_regs_t *));
+int kdb_trap(int, int, db_regs_t *);
 
 #endif	/* _I386_DB_MACHDEP_H_ */
diff --git a/sys/arch/i386/include/disklabel.h b/sys/arch/i386/include/disklabel.h
index 7b288a7b0a6..8e9a284a166 100644
--- a/sys/arch/i386/include/disklabel.h
+++ b/sys/arch/i386/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.23 2000/12/06 17:18:58 deraadt Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.24 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $	*/
 
 /*
@@ -95,7 +95,7 @@ struct cpu_disklabel {
 #define	DPSECT(s)	((s) & 0x3f)
 #define	DPCYL(c, s)	((c) + (((s) & 0xc0) << 2))
 
-static __inline u_int32_t get_le __P((void *));
+static __inline u_int32_t get_le(void *);
 
 static __inline u_int32_t
 #ifdef __cplusplus
diff --git a/sys/arch/i386/include/float.h b/sys/arch/i386/include/float.h
index 19351cc0ee7..50a2c3b1db8 100644
--- a/sys/arch/i386/include/float.h
+++ b/sys/arch/i386/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.3 2000/08/05 22:07:31 niklas Exp $	*/
+/*	$OpenBSD: float.h,v 1.4 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: float.h,v 1.8 1995/06/20 20:45:37 jtc Exp $	*/
 
 /*
@@ -42,7 +42,7 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int __flt_rounds __P((void));
+int __flt_rounds(void);
 __END_DECLS
 
 #define FLT_RADIX	2		/* b */
diff --git a/sys/arch/i386/include/freebsd_machdep.h b/sys/arch/i386/include/freebsd_machdep.h
index 3f735a68c7f..c18e5d9dc7e 100644
--- a/sys/arch/i386/include/freebsd_machdep.h
+++ b/sys/arch/i386/include/freebsd_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: freebsd_machdep.h,v 1.5 2000/08/05 22:07:31 niklas Exp $	*/
+/*	$OpenBSD: freebsd_machdep.h,v 1.6 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: freebsd_machdep.h,v 1.1 1995/10/10 01:22:35 mycroft Exp $	*/
 
 /*
@@ -159,7 +159,7 @@ struct freebsd_ptrace_reg {
 #define FREEBSD___LDPGSZ	4096
 
 #ifdef _KERNEL
-void freebsd_sendsig __P((sig_t, int, int, u_long, int, union sigval));
+void freebsd_sendsig(sig_t, int, int, u_long, int, union sigval);
 #endif
 
 #endif /* _FREEBSD_MACHDEP_H */
diff --git a/sys/arch/i386/include/gdt.h b/sys/arch/i386/include/gdt.h
index f3e3d7f90d0..1568b573a86 100644
--- a/sys/arch/i386/include/gdt.h
+++ b/sys/arch/i386/include/gdt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdt.h,v 1.8 2001/05/05 23:25:45 art Exp $	*/
+/*	$OpenBSD: gdt.h,v 1.9 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: gdt.h,v 1.3 1996/02/27 22:32:11 jtc Exp $	*/
 
 /*-
@@ -38,9 +38,9 @@
  */
 
 #ifdef _KERNEL
-void gdt_init __P((void));
-void tss_alloc __P((struct pcb *));
-void tss_free __P((struct pcb *));
-void ldt_alloc __P((struct pmap *, union descriptor *, size_t));
-void ldt_free __P((struct pmap *));
+void gdt_init(void);
+void tss_alloc(struct pcb *);
+void tss_free(struct pcb *);
+void ldt_alloc(struct pmap *, union descriptor *, size_t);
+void ldt_free(struct pmap *);
 #endif
diff --git a/sys/arch/i386/include/intr.h b/sys/arch/i386/include/intr.h
index 3bd8226f64d..c496a25c097 100644
--- a/sys/arch/i386/include/intr.h
+++ b/sys/arch/i386/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.12 2001/12/14 08:35:12 niklas Exp $	*/
+/*	$OpenBSD: intr.h,v 1.13 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: intr.h,v 1.5 1996/05/13 06:11:28 mycroft Exp $	*/
 
 /*
@@ -104,12 +104,12 @@ int iunmask[NIPL];	/* Bitmasks telling what interrupts are accepted. */
 #define IMASK(level) imask[IPL(level)]
 #define IUNMASK(level) iunmask[IPL(level)]
 
-extern void Xspllower __P((void));
+extern void Xspllower(void);
 
-static __inline int splraise __P((int));
-static __inline int spllower __P((int));
-#define SPLX_DECL void splx __P((int));
-static __inline void softintr __P((int));
+static __inline int splraise(int);
+static __inline int spllower(int);
+#define SPLX_DECL void splx(int);
+static __inline void softintr(int);
 
 /*
  * Raise current interrupt priority level, and return the old one.
diff --git a/sys/arch/i386/include/linux_machdep.h b/sys/arch/i386/include/linux_machdep.h
index 58846882b22..e02e7f9068a 100644
--- a/sys/arch/i386/include/linux_machdep.h
+++ b/sys/arch/i386/include/linux_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_machdep.h,v 1.8 2001/04/07 21:44:02 tholo Exp $	*/
+/*	$OpenBSD: linux_machdep.h,v 1.9 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: linux_machdep.h,v 1.5 1996/05/03 19:26:28 christos Exp $	*/
 
 /*
@@ -78,8 +78,8 @@ struct linux_sigframe {
 };
 
 #ifdef _KERNEL
-void linux_sendsig __P((sig_t, int, int, u_long, int, union sigval));
-dev_t linux_fakedev __P((dev_t));
+void linux_sendsig(sig_t, int, int, u_long, int, union sigval);
+dev_t linux_fakedev(dev_t);
 #endif
 
 /*
diff --git a/sys/arch/i386/include/pccons.h b/sys/arch/i386/include/pccons.h
index 372f9ab331c..3195344edf3 100644
--- a/sys/arch/i386/include/pccons.h
+++ b/sys/arch/i386/include/pccons.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pccons.h,v 1.6 2001/01/30 00:00:32 aaron Exp $	*/
+/*	$OpenBSD: pccons.h,v 1.7 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pccons.h,v 1.4 1996/02/02 18:06:06 mycroft Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ typedef struct {
 #define CONSOLE_SET_BLANK		_IOW('t',130,int)
 
 #ifdef _KERNEL
-int pccnattach	__P((void));
+int pccnattach(void);
 
 #if (NPCCONSKBD > 0)
 int pcconskbd_cnattach	_P((pckbc_tag_t, pckbc_slot_t));
diff --git a/sys/arch/i386/include/pmap.h b/sys/arch/i386/include/pmap.h
index ff7cca16a22..61e1fb1d9a9 100644
--- a/sys/arch/i386/include/pmap.h
+++ b/sys/arch/i386/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.25 2001/12/19 08:58:05 art Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.26 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pmap.h,v 1.44 2000/04/24 17:18:18 thorpej Exp $	*/
 
 /*
@@ -390,29 +390,29 @@ extern int pmap_pg_g;			/* do we support PG_G? */
  * prototypes
  */
 
-void		pmap_bootstrap __P((vaddr_t));
-boolean_t	pmap_change_attrs __P((struct vm_page *, int, int));
-static void	pmap_page_protect __P((struct vm_page *, vm_prot_t));
-void		pmap_page_remove  __P((struct vm_page *));
-static void	pmap_protect __P((struct pmap *, vaddr_t,
-				vaddr_t, vm_prot_t));
-void		pmap_remove __P((struct pmap *, vaddr_t, vaddr_t));
-boolean_t	pmap_test_attrs __P((struct vm_page *, int));
-void		pmap_transfer __P((struct pmap *, struct pmap *, vaddr_t,
-				   vsize_t, vaddr_t, boolean_t));
-static void	pmap_update_pg __P((vaddr_t));
-static void	pmap_update_2pg __P((vaddr_t,vaddr_t));
-void		pmap_write_protect __P((struct pmap *, vaddr_t,
-				vaddr_t, vm_prot_t));
-
-vaddr_t reserve_dumppages __P((vaddr_t)); /* XXX: not a pmap fn */
+void		pmap_bootstrap(vaddr_t);
+boolean_t	pmap_change_attrs(struct vm_page *, int, int);
+static void	pmap_page_protect(struct vm_page *, vm_prot_t);
+void		pmap_page_remove(struct vm_page *);
+static void	pmap_protect(struct pmap *, vaddr_t,
+				vaddr_t, vm_prot_t);
+void		pmap_remove(struct pmap *, vaddr_t, vaddr_t);
+boolean_t	pmap_test_attrs(struct vm_page *, int);
+void		pmap_transfer(struct pmap *, struct pmap *, vaddr_t,
+				   vsize_t, vaddr_t, boolean_t);
+static void	pmap_update_pg(vaddr_t);
+static void	pmap_update_2pg(vaddr_t,vaddr_t);
+void		pmap_write_protect(struct pmap *, vaddr_t,
+				vaddr_t, vm_prot_t);
+
+vaddr_t reserve_dumppages(vaddr_t); /* XXX: not a pmap fn */
 
 #define PMAP_GROWKERNEL		/* turn on pmap_growkernel interface */
 
 /*
  * Do idle page zero'ing uncached to avoid polluting the cache.
  */
-boolean_t	pmap_zero_page_uncached __P((paddr_t));
+boolean_t	pmap_zero_page_uncached(paddr_t);
 #define	PMAP_PAGEIDLEZERO(pa)	pmap_zero_page_uncached((pa))
 
 /*
@@ -502,7 +502,7 @@ pmap_protect(pmap, sva, eva, prot)
 }
 
 #if defined(USER_LDT)
-void	pmap_ldt_cleanup __P((struct proc *));
+void	pmap_ldt_cleanup(struct proc *);
 #define	PMAP_FORK
 #endif /* USER_LDT */
 
diff --git a/sys/arch/i386/include/profile.h b/sys/arch/i386/include/profile.h
index d3850e7748d..56723c1889a 100644
--- a/sys/arch/i386/include/profile.h
+++ b/sys/arch/i386/include/profile.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: profile.h,v 1.6 2001/11/30 20:26:02 mickey Exp $	*/
+/*	$OpenBSD: profile.h,v 1.7 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: profile.h,v 1.6 1995/03/28 18:17:08 jtc Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #define	_MCOUNT_DECL static __inline void _mcount
 
 #define	MCOUNT \
-extern void mcount __P((void)) __asm("mcount");				\
+extern void mcount(void) __asm("mcount");				\
 void									\
 mcount()								\
 {									\
diff --git a/sys/arch/i386/include/psl.h b/sys/arch/i386/include/psl.h
index 78b2a1a061b..f9dcb72032d 100644
--- a/sys/arch/i386/include/psl.h
+++ b/sys/arch/i386/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.11 2000/08/05 22:07:32 niklas Exp $	*/
+/*	$OpenBSD: psl.h,v 1.12 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: psl.h,v 1.30 1996/05/13 01:28:05 mycroft Exp $	*/
 
 /*-
@@ -84,7 +84,7 @@
  */
 
 struct intrhand {
-	int	(*ih_fun) __P((void *));
+	int	(*ih_fun)(void *);
 	void	*ih_arg;
 	u_long	ih_count;
 	struct	intrhand *ih_next;
diff --git a/sys/arch/i386/include/rbus_machdep.h b/sys/arch/i386/include/rbus_machdep.h
index 7bb855d1589..2808e44599c 100644
--- a/sys/arch/i386/include/rbus_machdep.h
+++ b/sys/arch/i386/include/rbus_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbus_machdep.h,v 1.1 2000/04/08 05:50:50 aaron Exp $ */
+/*	$OpenBSD: rbus_machdep.h,v 1.2 2002/03/14 01:26:33 millert Exp $ */
 /*	$NetBSD: rbus_machdep.h,v 1.2 1999/10/15 06:43:05 haya Exp $	*/
 
 /*
@@ -37,8 +37,8 @@
 
 struct pci_attach_args;		/* XXX */
 
-void _bus_space_unmap  __P((bus_space_tag_t, bus_space_handle_t,
-			     bus_size_t, bus_addr_t *));
+void _bus_space_unmap(bus_space_tag_t, bus_space_handle_t,
+			     bus_size_t, bus_addr_t *);
 
 #define md_space_map(bt, physaddr, size, flags, bshp) \
 	_bus_space_map((bt), (physaddr), (size), (flags), (bshp))
@@ -47,7 +47,7 @@ void _bus_space_unmap  __P((bus_space_tag_t, bus_space_handle_t,
 	_bus_space_unmap((bt), (bsh), (size), (adrp))
 
 
-rbus_tag_t rbus_pccbb_parent_io __P((struct pci_attach_args *pa));
-rbus_tag_t rbus_pccbb_parent_mem __P((struct pci_attach_args *pa));
+rbus_tag_t rbus_pccbb_parent_io(struct pci_attach_args *pa);
+rbus_tag_t rbus_pccbb_parent_mem(struct pci_attach_args *pa);
 
 #endif /* _ARCH_I386_I386_RBUS_MACHDEP_H_ */
diff --git a/sys/arch/i386/include/segments.h b/sys/arch/i386/include/segments.h
index df535490c22..d2bbca3c2c2 100644
--- a/sys/arch/i386/include/segments.h
+++ b/sys/arch/i386/include/segments.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: segments.h,v 1.8 2000/12/06 17:18:58 deraadt Exp $	*/
+/*	$OpenBSD: segments.h,v 1.9 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: segments.h,v 1.23 1996/02/01 22:31:03 mycroft Exp $	*/
 
 /*-
@@ -132,10 +132,10 @@ extern union descriptor gdt[], ldt[];
 extern struct gate_descriptor idt_region[];
 extern struct gate_descriptor *idt;
 
-void setgate __P((struct gate_descriptor *, void *, int, int, int, int));
-void setregion __P((struct region_descriptor *, void *, size_t));
-void setsegment __P((struct segment_descriptor *, void *, size_t, int, int,
-    int, int));
+void setgate(struct gate_descriptor *, void *, int, int, int, int);
+void setregion(struct region_descriptor *, void *, size_t);
+void setsegment(struct segment_descriptor *, void *, size_t, int, int,
+    int, int);
 #endif /* _KERNEL */
 
 #endif /* !_LOCORE */
diff --git a/sys/arch/i386/include/svr4_machdep.h b/sys/arch/i386/include/svr4_machdep.h
index cc77173d17b..17926ef3cfc 100644
--- a/sys/arch/i386/include/svr4_machdep.h
+++ b/sys/arch/i386/include/svr4_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svr4_machdep.h,v 1.6 1997/11/11 22:53:41 deraadt Exp $	 */
+/*	$OpenBSD: svr4_machdep.h,v 1.7 2002/03/14 01:26:33 millert Exp $	 */
 /*	$NetBSD: svr4_machdep.h,v 1.5 1995/03/31 02:51:37 christos Exp $	 */
 
 /*
@@ -70,9 +70,9 @@ typedef struct {
 struct svr4_ucontext;
 
 #ifdef _KERNEL
-void svr4_getcontext __P((struct proc *, struct svr4_ucontext *, int, int));
-int svr4_setcontext __P((struct proc *, struct svr4_ucontext *));
-void svr4_sendsig __P((sig_t, int, int, u_long, int, union sigval));
+void svr4_getcontext(struct proc *, struct svr4_ucontext *, int, int);
+int svr4_setcontext(struct proc *, struct svr4_ucontext *);
+void svr4_sendsig(sig_t, int, int, u_long, int, union sigval);
 #endif
 
 typedef struct {
diff --git a/sys/arch/i386/include/sysarch.h b/sys/arch/i386/include/sysarch.h
index d4f84c09126..e2f3dfccc23 100644
--- a/sys/arch/i386/include/sysarch.h
+++ b/sys/arch/i386/include/sysarch.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysarch.h,v 1.3 2000/08/05 22:07:33 niklas Exp $	*/
+/*	$OpenBSD: sysarch.h,v 1.4 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: sysarch.h,v 1.8 1996/01/08 13:51:44 mycroft Exp $	*/
 
 #ifndef _I386_SYSARCH_H_
@@ -39,12 +39,12 @@ struct i386_set_ioperm_args {
 };
 
 #ifndef _KERNEL
-int i386_get_ldt __P((int, union descriptor *, int));
-int i386_set_ldt __P((int, union descriptor *, int));
-int i386_iopl __P((int));
-int i386_get_ioperm __P((u_long *));
-int i386_set_ioperm __P((u_long *));
-int sysarch __P((int, char *));
+int i386_get_ldt(int, union descriptor *, int);
+int i386_set_ldt(int, union descriptor *, int);
+int i386_iopl(int);
+int i386_get_ioperm(u_long *);
+int i386_set_ioperm(u_long *);
+int sysarch(int, char *);
 #endif
 
 #endif /* !_I386_SYSARCH_H_ */
diff --git a/sys/arch/i386/include/vm86.h b/sys/arch/i386/include/vm86.h
index f8a9f0d7c20..e69229bea6a 100644
--- a/sys/arch/i386/include/vm86.h
+++ b/sys/arch/i386/include/vm86.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm86.h,v 1.7 1996/05/30 09:30:11 deraadt Exp $	*/
+/*	$OpenBSD: vm86.h,v 1.8 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: vm86.h,v 1.8 1996/05/03 19:26:32 christos Exp $	*/
 
 #undef	VM86_USE_VIF
@@ -81,15 +81,15 @@ struct vm86_struct {
 #define VCPU_586		5
 
 #ifdef _KERNEL
-int i386_vm86 __P((struct proc *, char *, register_t *));
-void vm86_gpfault __P((struct proc *, int));
-void vm86_return __P((struct proc *, int));
-static __inline void clr_vif __P((struct proc *));
-static __inline void set_vif __P((struct proc *));
-static __inline void set_vflags __P((struct proc *, int));
-static __inline int get_vflags __P((struct proc *));
-static __inline void set_vflags_short __P((struct proc *, int));
-static __inline int get_vflags_short __P((struct proc *));
+int i386_vm86(struct proc *, char *, register_t *);
+void vm86_gpfault(struct proc *, int);
+void vm86_return(struct proc *, int);
+static __inline void clr_vif(struct proc *);
+static __inline void set_vif(struct proc *);
+static __inline void set_vflags(struct proc *, int);
+static __inline int get_vflags(struct proc *);
+static __inline void set_vflags_short(struct proc *, int);
+static __inline int get_vflags_short(struct proc *);
 
 static __inline void
 clr_vif(p)
@@ -182,5 +182,5 @@ get_vflags_short(p)
 	return (flags);
 }
 #else
-int i386_vm86 __P((struct vm86_struct *vmcp));
+int i386_vm86(struct vm86_struct *vmcp);
 #endif
diff --git a/sys/arch/i386/isa/ahc_isa.c b/sys/arch/i386/isa/ahc_isa.c
index 7be50b00ead..1a6b16452e3 100644
--- a/sys/arch/i386/isa/ahc_isa.c
+++ b/sys/arch/i386/isa/ahc_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahc_isa.c,v 1.6 2002/02/16 04:36:32 smurph Exp $	*/
+/*	$OpenBSD: ahc_isa.c,v 1.7 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: ahc_isa.c,v 1.5 1996/10/21 22:27:39 thorpej Exp $	*/
 
 /*
@@ -113,13 +113,13 @@
 #define	AHC_ISA_PRIMING_VID(index)	(AHC_ISA_VID + (index))
 #define	AHC_ISA_PRIMING_PID(index)	(AHC_ISA_PID + (index))
 
-int	ahc_isa_irq __P((bus_space_tag_t, bus_space_handle_t));
-int	ahc_isa_idstring __P((bus_space_tag_t, bus_space_handle_t, char *));
-int	ahc_isa_match __P((struct isa_attach_args *, bus_addr_t));
+int	ahc_isa_irq(bus_space_tag_t, bus_space_handle_t);
+int	ahc_isa_idstring(bus_space_tag_t, bus_space_handle_t, char *);
+int	ahc_isa_match(struct isa_attach_args *, bus_addr_t);
 
-int	ahc_isa_probe __P((struct device *, void *, void *));
-void	ahc_isa_attach __P((struct device *, struct device *, void *));
-void	aha2840_load_seeprom __P((struct ahc_softc *ahc));
+int	ahc_isa_probe(struct device *, void *, void *);
+void	ahc_isa_attach(struct device *, struct device *, void *);
+void	aha2840_load_seeprom(struct ahc_softc *ahc);
 
 struct cfattach ahc_isa_ca = {
 	sizeof(struct ahc_softc), ahc_isa_probe, ahc_isa_attach
diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c
index 1c7c26116a8..489a9874593 100644
--- a/sys/arch/i386/isa/clock.c
+++ b/sys/arch/i386/isa/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.24 2001/09/21 20:38:42 mickey Exp $	*/
+/*	$OpenBSD: clock.c,v 1.25 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: clock.c,v 1.39 1996/05/12 23:11:54 mycroft Exp $	*/
 
 /*-
@@ -115,11 +115,11 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #define __BROKEN_INDIRECT_CONFIG /* XXX */
 #ifdef __BROKEN_INDIRECT_CONFIG
-int sysbeepmatch __P((struct device *, void *, void *));
+int sysbeepmatch(struct device *, void *, void *);
 #else
-int sysbeepmatch __P((struct device *, struct cfdata *, void *));
+int sysbeepmatch(struct device *, struct cfdata *, void *);
 #endif
-void sysbeepattach __P((struct device *, struct device *, void *));
+void sysbeepattach(struct device *, struct device *, void *);
 
 struct cfattach sysbeep_ca = {
 	sizeof(struct device), sysbeepmatch, sysbeepattach
@@ -133,20 +133,20 @@ static int ppi_attached;
 static pcppi_tag_t ppicookie;
 #endif /* PCPPI */
 
-void	spinwait __P((int));
-void	findcpuspeed __P((void));
-int	clockintr __P((void *));
-int	gettick __P((void));
-void	sysbeep __P((int, int));
-int	rtcget __P((mc_todregs *));
-void	rtcput __P((mc_todregs *));
-int 	hexdectodec __P((int));
-int	dectohexdec __P((int));
-int	rtcintr __P((void *));
-void	rtcdrain __P((void *));
-
-u_int mc146818_read __P((void *, u_int));
-void mc146818_write __P((void *, u_int, u_int));
+void	spinwait(int);
+void	findcpuspeed(void);
+int	clockintr(void *);
+int	gettick(void);
+void	sysbeep(int, int);
+int	rtcget(mc_todregs *);
+void	rtcput(mc_todregs *);
+int 	hexdectodec(int);
+int	dectohexdec(int);
+int	rtcintr(void *);
+void	rtcdrain(void *);
+
+u_int mc146818_read(void *, u_int);
+void mc146818_write(void *, u_int, u_int);
 
 #if defined(I586_CPU) || defined(I686_CPU)
 int pentium_mhz;
@@ -483,7 +483,7 @@ static int timeset;
  * check whether the CMOS layout is "standard"-like (ie, not PS/2-like),
  * to be called at splclock()
  */
-int cmoscheck __P((void));
+int cmoscheck(void);
 int
 cmoscheck()
 {
@@ -510,7 +510,7 @@ int rtc_update_century = 0;
  * into full width.
  * Being here, deal with the CMOS century byte.
  */
-int clock_expandyear __P((int));
+int clock_expandyear(int);
 int
 clock_expandyear(clockyear)
 	int clockyear;
diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c
index 6347d5ee698..87463b342c8 100644
--- a/sys/arch/i386/isa/isa_machdep.c
+++ b/sys/arch/i386/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.c,v 1.44 2001/12/06 21:09:13 niklas Exp $	*/
+/*	$OpenBSD: isa_machdep.c,v 1.45 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $	*/
 
 #define ISA_DMA_STATS
@@ -150,43 +150,43 @@ extern	vm_offset_t avail_end;
 
 #define	IDTVEC(name)	__CONCAT(X,name)
 /* default interrupt vector table entries */
-typedef int (*vector) __P((void));
+typedef int (*vector)(void);
 extern vector IDTVEC(intr)[];
-void isa_strayintr __P((int));
-void intr_calculatemasks __P((void));
-int fakeintr __P((void *));
+void isa_strayintr(int);
+void intr_calculatemasks(void);
+int fakeintr(void *);
 
 #if NISADMA > 0
-int	_isa_bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int,
-	    bus_size_t, bus_size_t, int, bus_dmamap_t *));
-void	_isa_bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t));
-int	_isa_bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
-	    bus_size_t, struct proc *, int));
-int	_isa_bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct mbuf *, int));
-int	_isa_bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct uio *, int));
-int	_isa_bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
-	    bus_dma_segment_t *, int, bus_size_t, int));
-void	_isa_bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t));
-void	_isa_bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t,
-	    bus_addr_t, bus_size_t, int));
-
-int	_isa_bus_dmamem_alloc __P((bus_dma_tag_t, bus_size_t, bus_size_t,
-	    bus_size_t, bus_dma_segment_t *, int, int *, int));
-void	_isa_bus_dmamem_free __P((bus_dma_tag_t,
-	    bus_dma_segment_t *, int));
-int	_isa_bus_dmamem_map __P((bus_dma_tag_t, bus_dma_segment_t *,
-	    int, size_t, caddr_t *, int));
-void	_isa_bus_dmamem_unmap __P((bus_dma_tag_t, caddr_t, size_t));
-paddr_t	_isa_bus_dmamem_mmap __P((bus_dma_tag_t, bus_dma_segment_t *,
-	    int, off_t, int, int));
-
-int	_isa_dma_check_buffer __P((void *, bus_size_t, int, bus_size_t,
-	    struct proc *));
-int	_isa_dma_alloc_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t,
-	    bus_size_t, int));
-void	_isa_dma_free_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t));
+int	_isa_bus_dmamap_create(bus_dma_tag_t, bus_size_t, int,
+	    bus_size_t, bus_size_t, int, bus_dmamap_t *);
+void	_isa_bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
+int	_isa_bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
+	    bus_size_t, struct proc *, int);
+int	_isa_bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
+	    struct mbuf *, int);
+int	_isa_bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
+	    struct uio *, int);
+int	_isa_bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
+	    bus_dma_segment_t *, int, bus_size_t, int);
+void	_isa_bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+void	_isa_bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t,
+	    bus_addr_t, bus_size_t, int);
+
+int	_isa_bus_dmamem_alloc(bus_dma_tag_t, bus_size_t, bus_size_t,
+	    bus_size_t, bus_dma_segment_t *, int, int *, int);
+void	_isa_bus_dmamem_free(bus_dma_tag_t,
+	    bus_dma_segment_t *, int);
+int	_isa_bus_dmamem_map(bus_dma_tag_t, bus_dma_segment_t *,
+	    int, size_t, caddr_t *, int);
+void	_isa_bus_dmamem_unmap(bus_dma_tag_t, caddr_t, size_t);
+paddr_t	_isa_bus_dmamem_mmap(bus_dma_tag_t, bus_dma_segment_t *,
+	    int, off_t, int, int);
+
+int	_isa_dma_check_buffer(void *, bus_size_t, int, bus_size_t,
+	    struct proc *);
+int	_isa_dma_alloc_bouncebuf(bus_dma_tag_t, bus_dmamap_t,
+	    bus_size_t, int);
+void	_isa_dma_free_bouncebuf(bus_dma_tag_t, bus_dmamap_t);
 
 /*
  * Entry points for ISA DMA.  These are mostly wrappers around
@@ -493,7 +493,7 @@ isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg, ih_what)
 	int irq;
 	int type;
 	int level;
-	int (*ih_fun) __P((void *));
+	int (*ih_fun)(void *);
 	void *ih_arg;
 	char *ih_what;
 {
diff --git a/sys/arch/i386/isa/isa_machdep.h b/sys/arch/i386/isa/isa_machdep.h
index 71f15937a5e..4886c9e21fb 100644
--- a/sys/arch/i386/isa/isa_machdep.h
+++ b/sys/arch/i386/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.h,v 1.15 1999/01/13 07:26:00 niklas Exp $	*/
+/*	$OpenBSD: isa_machdep.h,v 1.16 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: isa_machdep.h,v 1.7 1997/06/06 23:28:42 thorpej Exp $	*/
 
 /*-
@@ -105,13 +105,13 @@ struct isabus_attach_args;	/* XXX */
 /*
  * Functions provided to machine-independent ISA code.
  */
-void	isa_attach_hook __P((struct device *, struct device *,
-	    struct isabus_attach_args *));
-int	isa_intr_alloc __P((isa_chipset_tag_t, int, int, int *));
-int	isa_intr_check __P((isa_chipset_tag_t, int, int));
+void	isa_attach_hook(struct device *, struct device *,
+	    struct isabus_attach_args *);
+int	isa_intr_alloc(isa_chipset_tag_t, int, int, int *);
+int	isa_intr_check(isa_chipset_tag_t, int, int);
 void	*isa_intr_establish __P((isa_chipset_tag_t ic, int irq, int type,
 	    int level, int (*ih_fun)(void *), void *ih_arg, char *ih_what));
-void	isa_intr_disestablish __P((isa_chipset_tag_t ic, void *handler));
+void	isa_intr_disestablish(isa_chipset_tag_t ic, void *handler);
 
 /*
  * ALL OF THE FOLLOWING ARE MACHINE-DEPENDENT, AND SHOULD NOT BE USED
@@ -219,6 +219,6 @@ extern u_long atdevbase;           /* kernel virtual address of "hole" */
 /*
  * Miscellanous functions.
  */
-void sysbeep __P((int, int));		/* beep with the system speaker */
+void sysbeep(int, int);		/* beep with the system speaker */
 
 #endif /* _I386_ISA_MACHDEP_H_ XXX */
diff --git a/sys/arch/i386/isa/isapnp_machdep.h b/sys/arch/i386/isa/isapnp_machdep.h
index c719afdabe7..0d80a42ff29 100644
--- a/sys/arch/i386/isa/isapnp_machdep.h
+++ b/sys/arch/i386/isa/isapnp_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isapnp_machdep.h,v 1.1 1997/12/21 14:44:34 downsj Exp $	*/
+/*	$OpenBSD: isapnp_machdep.h,v 1.2 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: isapnp_machdep.h,v 1.2 1997/10/04 17:32:32 thorpej Exp $	*/
 
 /*-
@@ -70,7 +70,7 @@
 /*
  * Functions provided to machine-independent ISA PnP code.
  */
-int	isapnp_map __P((struct isapnp_softc *));
-void	isapnp_unmap __P((struct isapnp_softc *));
-int	isapnp_map_readport __P((struct isapnp_softc *));
-void	isapnp_unmap_readport __P((struct isapnp_softc *));
+int	isapnp_map(struct isapnp_softc *);
+void	isapnp_unmap(struct isapnp_softc *);
+int	isapnp_map_readport(struct isapnp_softc *);
+void	isapnp_unmap_readport(struct isapnp_softc *);
diff --git a/sys/arch/i386/isa/joy.c b/sys/arch/i386/isa/joy.c
index 2a144065e62..032377c2118 100644
--- a/sys/arch/i386/isa/joy.c
+++ b/sys/arch/i386/isa/joy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: joy.c,v 1.8 1999/01/13 07:26:01 niklas Exp $	*/
+/*	$OpenBSD: joy.c,v 1.9 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: joy.c,v 1.3 1996/05/05 19:46:15 christos Exp $	*/
 
 /*-
@@ -49,7 +49,7 @@
 #include <i386/isa/timerreg.h>
 #include <i386/isa/joyreg.h>
 
-static int	joy_get_tick __P((void));
+static int	joy_get_tick(void);
 
 struct cfdriver joy_cd = {
 	NULL, "joy", DV_DULL
diff --git a/sys/arch/i386/isa/joy_isa.c b/sys/arch/i386/isa/joy_isa.c
index 9b6442df21b..5f4a1bef5bc 100644
--- a/sys/arch/i386/isa/joy_isa.c
+++ b/sys/arch/i386/isa/joy_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: joy_isa.c,v 1.3 1999/01/13 07:26:01 niklas Exp $	*/
+/*	$OpenBSD: joy_isa.c,v 1.4 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: joy.c,v 1.3 1996/05/05 19:46:15 christos Exp $	*/
 
 /*-
@@ -49,8 +49,8 @@
 #include <i386/isa/timerreg.h>
 #include <i386/isa/joyreg.h>
 
-int		joy_isa_probe __P((struct device *, void *, void *));
-void		joy_isa_attach __P((struct device *, struct device *, void *));
+int		joy_isa_probe(struct device *, void *, void *);
+void		joy_isa_attach(struct device *, struct device *, void *);
 
 struct cfattach joy_isa_ca = {
 	sizeof(struct joy_softc), joy_isa_probe, joy_isa_attach
diff --git a/sys/arch/i386/isa/joy_isapnp.c b/sys/arch/i386/isa/joy_isapnp.c
index 0916c828b8b..43bcc837564 100644
--- a/sys/arch/i386/isa/joy_isapnp.c
+++ b/sys/arch/i386/isa/joy_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: joy_isapnp.c,v 1.3 1999/01/13 07:26:01 niklas Exp $	*/
+/*	$OpenBSD: joy_isapnp.c,v 1.4 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: joy.c,v 1.3 1996/05/05 19:46:15 christos Exp $	*/
 
 /*-
@@ -49,8 +49,8 @@
 #include <i386/isa/timerreg.h>
 #include <i386/isa/joyreg.h>
 
-int		joy_isapnp_probe __P((struct device *, void *, void *));
-void		joy_isapnp_attach __P((struct device *, struct device *, void *));
+int		joy_isapnp_probe(struct device *, void *, void *);
+void		joy_isapnp_attach(struct device *, struct device *, void *);
 
 struct cfattach joy_isapnp_ca = {
 	sizeof(struct joy_softc), joy_isapnp_probe, joy_isapnp_attach
diff --git a/sys/arch/i386/isa/joyreg.h b/sys/arch/i386/isa/joyreg.h
index ccce2ec207e..d12bc61754e 100644
--- a/sys/arch/i386/isa/joyreg.h
+++ b/sys/arch/i386/isa/joyreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: joyreg.h,v 1.2 1999/01/13 07:26:01 niklas Exp $	*/
+/*	$OpenBSD: joyreg.h,v 1.3 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: joy.c,v 1.3 1996/05/05 19:46:15 christos Exp $	*/
 
 /*-
@@ -66,5 +66,5 @@ struct joy_softc {
 	int	timeout[2];
 };
 
-int		joyopen __P((dev_t, int, int, struct proc *));
-int		joyclose __P((dev_t, int, int, struct proc *));
+int		joyopen(dev_t, int, int, struct proc *);
+int		joyclose(dev_t, int, int, struct proc *);
diff --git a/sys/arch/i386/isa/lms.c b/sys/arch/i386/isa/lms.c
index c397c3367d5..7edde899115 100644
--- a/sys/arch/i386/isa/lms.c
+++ b/sys/arch/i386/isa/lms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lms.c,v 1.17 2001/08/07 19:24:27 jason Exp $	*/
+/*	$OpenBSD: lms.c,v 1.18 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: lms.c,v 1.38 2000/01/08 02:57:25 takemura Exp $	*/
 
 /*-
@@ -57,17 +57,17 @@ struct lms_softc {		/* driver status information */
 	struct device *sc_wsmousedev;
 };
 
-int lmsprobe __P((struct device *, void *, void *));
-void lmsattach __P((struct device *, struct device *, void *));
-int lmsintr __P((void *));
+int lmsprobe(struct device *, void *, void *);
+void lmsattach(struct device *, struct device *, void *);
+int lmsintr(void *);
 
 struct cfattach lms_ca = {
 	sizeof(struct lms_softc), lmsprobe, lmsattach
 };
 
-int	lms_enable __P((void *));
-int	lms_ioctl __P((void *, u_long, caddr_t, int, struct proc *));
-void	lms_disable __P((void *));
+int	lms_enable(void *);
+int	lms_ioctl(void *, u_long, caddr_t, int, struct proc *);
+void	lms_disable(void *);
 
 const struct wsmouse_accessops lms_accessops = {
 	lms_enable,
diff --git a/sys/arch/i386/isa/mms.c b/sys/arch/i386/isa/mms.c
index c622e672e72..1b84aecf965 100644
--- a/sys/arch/i386/isa/mms.c
+++ b/sys/arch/i386/isa/mms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mms.c,v 1.15 2001/08/07 19:24:27 jason Exp $ */
+/*	$OpenBSD: mms.c,v 1.16 2002/03/14 01:26:33 millert Exp $ */
 /*	$NetBSD: mms.c,v 1.35 2000/01/08 02:57:25 takemura Exp $	*/
 
 /*-
@@ -54,17 +54,17 @@ struct mms_softc {		/* driver status information */
 	struct device *sc_wsmousedev;
 };
 
-int mmsprobe __P((struct device *, void *, void *));
-void mmsattach __P((struct device *, struct device *, void *));
-int mmsintr __P((void *));
+int mmsprobe(struct device *, void *, void *);
+void mmsattach(struct device *, struct device *, void *);
+int mmsintr(void *);
 
 struct cfattach mms_ca = {
 	sizeof(struct mms_softc), mmsprobe, mmsattach
 };
 
-int	mms_enable __P((void *));
-int	mms_ioctl __P((void *, u_long, caddr_t, int, struct proc *));
-void	mms_disable __P((void *));
+int	mms_enable(void *);
+int	mms_ioctl(void *, u_long, caddr_t, int, struct proc *);
+void	mms_disable(void *);
 
 const struct wsmouse_accessops mms_accessops = {
 	mms_enable,
diff --git a/sys/arch/i386/isa/npx.c b/sys/arch/i386/isa/npx.c
index ff321001a9c..a976ea241b1 100644
--- a/sys/arch/i386/isa/npx.c
+++ b/sys/arch/i386/isa/npx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: npx.c,v 1.24 2002/02/18 07:58:39 ericj Exp $	*/
+/*	$OpenBSD: npx.c,v 1.25 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: npx.c,v 1.57 1996/05/12 23:12:24 mycroft Exp $	*/
 
 #if 0
@@ -105,19 +105,19 @@
 #define	clts()			__asm("clts")
 #define	stts()			lcr0(rcr0() | CR0_TS)
 
-int npxdna __P((struct proc *));
-void npxexit __P((void));
-int npxintr __P((void *));
-static int npxprobe1 __P((struct isa_attach_args *));
-static void npxsave1 __P((void));
+int npxdna(struct proc *);
+void npxexit(void);
+int npxintr(void *);
+static int npxprobe1(struct isa_attach_args *);
+static void npxsave1(void);
 
 struct npx_softc {
 	struct device sc_dev;
 	void *sc_ih;
 };
 
-int npxprobe __P((struct device *, void *, void *));
-void npxattach __P((struct device *, struct device *, void *));
+int npxprobe(struct device *, void *, void *);
+void npxattach(struct device *, struct device *, void *);
 
 struct cfattach npx_ca = {
 	sizeof(struct npx_softc), npxprobe, npxattach
@@ -150,7 +150,7 @@ extern int i386_fpu_fdivbug;
  * interrupts.  We'll still need a special exception 16 handler.  The busy
  * latch stuff in probintr() can be moved to npxprobe().
  */
-void probeintr __P((void));
+void probeintr(void);
 asm (".text\n\t"
 "_probeintr:\n\t"
 	"ss\n\t"
@@ -164,7 +164,7 @@ asm (".text\n\t"
 	"popl	%eax\n\t"
 	"iret\n\t");
 
-void probetrap __P((void));
+void probetrap(void);
 asm (".text\n\t"
 "_probetrap:\n\t"
 	"ss\n\t"
@@ -305,7 +305,7 @@ npxprobe(parent, match, aux)
 	return (result);
 }
 
-int npx586bug1 __P((int, int));
+int npx586bug1(int, int);
 asm (".text\n\t"
 "_npx586bug1:\n\t"
 	"fildl	4(%esp)		# x\n\t"
diff --git a/sys/arch/i386/isa/pccom.c b/sys/arch/i386/isa/pccom.c
index c67edf3d455..79b848d80dd 100644
--- a/sys/arch/i386/isa/pccom.c
+++ b/sys/arch/i386/isa/pccom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pccom.c,v 1.41 2002/01/30 20:45:34 nordin Exp $	*/
+/*	$OpenBSD: pccom.c,v 1.42 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $	*/
 
 /*
@@ -107,17 +107,17 @@
 cdev_decl(com);
 bdev_decl(com);
 
-static u_char tiocm_xxx2mcr __P((int));
+static u_char tiocm_xxx2mcr(int);
 
-void pccom_xr16850_fifo_init __P((bus_space_tag_t, bus_space_handle_t));
+void pccom_xr16850_fifo_init(bus_space_tag_t, bus_space_handle_t);
 
 /*
  * XXX the following two cfattach structs should be different, and possibly
  * XXX elsewhere.
  */
-int	comprobe __P((struct device *, void *, void *));
-void	comattach __P((struct device *, struct device *, void *));
-void	compwroff __P((struct com_softc *));
+int	comprobe(struct device *, void *, void *);
+void	comattach(struct device *, struct device *, void *);
+void	compwroff(struct com_softc *);
 
 #if NPCCOM_ISA
 struct cfattach pccom_isa_ca = {
@@ -141,7 +141,7 @@ struct cfdriver pccom_cd = {
 	NULL, "pccom", DV_TTY
 };
 
-void cominit __P((bus_space_tag_t, bus_space_handle_t, int));
+void cominit(bus_space_tag_t, bus_space_handle_t, int);
 
 #ifndef CONSPEED
 #define	CONSPEED B9600
@@ -171,8 +171,8 @@ static	bus_space_tag_t com_kgdb_iot;
 static	bus_space_handle_t com_kgdb_ioh;
 static	int com_kgdb_attached;
 
-int	com_kgdb_getc __P((void *));
-void	com_kgdb_putc __P((void *, int));
+int	com_kgdb_getc(void *);
+void	com_kgdb_putc(void *, int);
 #endif /* KGDB */
 
 #define	DEVUNIT(x)	(minor(x) & 0x7f)
diff --git a/sys/arch/i386/isa/pccomvar.h b/sys/arch/i386/isa/pccomvar.h
index 80fa32c9967..781b59f0752 100644
--- a/sys/arch/i386/isa/pccomvar.h
+++ b/sys/arch/i386/isa/pccomvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pccomvar.h,v 1.13 2001/08/08 19:07:17 mickey Exp $	*/
+/*	$OpenBSD: pccomvar.h,v 1.14 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: comvar.h,v 1.5 1996/05/05 19:50:47 christos Exp $	*/
 
 /*
@@ -105,45 +105,45 @@ struct com_softc {
 	int sc_tbc;
 
 	/* power management hooks */
-	int (*enable) __P((struct com_softc *));
-	void (*disable) __P((struct com_softc *));
+	int (*enable)(struct com_softc *);
+	void (*disable)(struct com_softc *);
 	int enabled;
 };
 
-int	comprobe1 __P((bus_space_tag_t, bus_space_handle_t));
-void	cominit __P((bus_space_tag_t, bus_space_handle_t, int));
-int	comstop __P((struct tty *, int));
-int	comintr __P((void *));
-int	com_detach __P((struct device *, int));
-int	com_activate __P((struct device *, enum devact));
+int	comprobe1(bus_space_tag_t, bus_space_handle_t);
+void	cominit(bus_space_tag_t, bus_space_handle_t, int);
+int	comstop(struct tty *, int);
+int	comintr(void *);
+int	com_detach(struct device *, int);
+int	com_activate(struct device *, enum devact);
 
 #ifdef COM_HAYESP
-int comprobeHAYESP __P((bus_space_handle_t hayespioh, struct com_softc *sc));
+int comprobeHAYESP(bus_space_handle_t hayespioh, struct com_softc *sc);
 #endif
-void	comdiag		__P((void *));
-int	comspeed	__P((long, long));
-int	comparam	__P((struct tty *, struct termios *));
-void	comstart	__P((struct tty *));
-void	comsoft		__P((void));
-int	comhwiflow	__P((struct tty *, int));
-void	com_raisedtr	__P((void *));
+void	comdiag(void *);
+int	comspeed(long, long);
+int	comparam(struct tty *, struct termios *);
+void	comstart(struct tty *);
+void	comsoft(void);
+int	comhwiflow(struct tty *, int);
+void	com_raisedtr(void *);
 
 struct consdev;
-void	comcnprobe	__P((struct consdev *));
-void	comcninit	__P((struct consdev *));
-int	comcngetc	__P((dev_t));
-void	comcnputc	__P((dev_t, int));
-void	comcnpollc	__P((dev_t, int));
-int	com_common_getc	__P((bus_space_tag_t, bus_space_handle_t));
-void	com_common_putc	__P((bus_space_tag_t, bus_space_handle_t, int));
+void	comcnprobe(struct consdev *);
+void	comcninit(struct consdev *);
+int	comcngetc(dev_t);
+void	comcnputc(dev_t, int);
+void	comcnpollc(dev_t, int);
+int	com_common_getc(bus_space_tag_t, bus_space_handle_t);
+void	com_common_putc(bus_space_tag_t, bus_space_handle_t, int);
 
 #if defined(DDB) || defined(KGDB)
-void	com_enable_debugport	__P((struct com_softc *));
+void	com_enable_debugport(struct com_softc *);
 #endif /* DDB || KGDB */
 
 #ifdef KGDB
-int	com_kgdb_attach	__P((bus_space_tag_t, int, int, int, tcflag_t));
-int	kgdbintr	__P((void *));
+int	com_kgdb_attach(bus_space_tag_t, int, int, int, tcflag_t);
+int	kgdbintr(void *);
 #endif /* KGDB */
 
 extern int comconsaddr;
diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c
index ce9e6a98eb7..6f3e017d978 100644
--- a/sys/arch/i386/isa/pccons.c
+++ b/sys/arch/i386/isa/pccons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pccons.c,v 1.48 2001/11/01 12:13:46 art Exp $	*/
+/*	$OpenBSD: pccons.c,v 1.49 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pccons.c,v 1.99.4.1 1996/06/04 20:03:53 cgd Exp $	*/
 
 /*-
@@ -129,11 +129,11 @@ struct pc_softc {
 	struct	tty *sc_tty;
 };
 
-int pcprobe __P((struct device *, void *, void *));
-void pcattach __P((struct device *, struct device *, void *));
-int pcintr __P((void *));
-static void screen_restore __P((int));
-static void screen_blank __P((void *));
+int pcprobe(struct device *, void *, void *);
+void pcattach(struct device *, struct device *, void *);
+int pcintr(void *);
+static void screen_restore(int);
+static void screen_blank(void *);
 
 struct cfattach pc_ca = {
 	sizeof(struct pc_softc), pcprobe, pcattach
@@ -149,36 +149,36 @@ struct cfdriver pc_cd = {
 
 static unsigned int addr_6845 = MONO_BASE;
 
-void pcinit __P((void));
-char *sget __P((void));
-void sput __P((u_char *, int));
+void pcinit(void);
+char *sget(void);
+void sput(u_char *, int);
 #ifdef XSERVER
-void pc_xmode_on __P((void));
-void pc_xmode_off __P((void));
+void pc_xmode_on(void);
+void pc_xmode_off(void);
 #endif
 
-void	pcstart __P((struct tty *));
-int	pcparam __P((struct tty *, struct termios *));
+void	pcstart(struct tty *);
+int	pcparam(struct tty *, struct termios *);
 
-int kbd_cmd __P((u_char, u_char));
-void set_cursor_shape __P((void));
+int kbd_cmd(u_char, u_char);
+void set_cursor_shape(void);
 #ifdef XSERVER
-void get_cursor_shape __P((void));
+void get_cursor_shape(void);
 #endif
-void do_async_update __P((void *));
-void async_update __P((void));
-
-static __inline int kbd_wait_output __P((void));
-static __inline int kbd_wait_input __P((void));
-static __inline void kbd_flush_input __P((void));
-static u_char kbc_get8042cmd __P((void));
-static int kbc_put8042cmd __P((u_char));
-
-void pccnprobe __P((struct consdev *));
-void pccninit __P((struct consdev *));
-void pccnputc __P((dev_t, char));
-int pccngetc __P((dev_t));
-void pccnpollc __P((dev_t, int));
+void do_async_update(void *);
+void async_update(void);
+
+static __inline int kbd_wait_output(void);
+static __inline int kbd_wait_input(void);
+static __inline void kbd_flush_input(void);
+static u_char kbc_get8042cmd(void);
+static int kbc_put8042cmd(u_char);
+
+void pccnprobe(struct consdev *);
+void pccninit(struct consdev *);
+void pccnputc(dev_t, char);
+int pccngetc(dev_t);
+void pccnpollc(dev_t, int);
 
 /* wait 7+ us for keyboard controller; ~1.25us per inb() */
 #define	KBD_DELAY \
diff --git a/sys/arch/i386/pci/amd756.c b/sys/arch/i386/pci/amd756.c
index 5a18cbb5ba3..bd86f45dd1d 100644
--- a/sys/arch/i386/pci/amd756.c
+++ b/sys/arch/i386/pci/amd756.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amd756.c,v 1.2 2001/01/25 00:07:40 mickey Exp $	*/
+/*	$OpenBSD: amd756.c,v 1.3 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD$	*/
 
 /*-
@@ -89,13 +89,13 @@ struct viper_handle {
 	pcitag_t ph_tag;
 };
 
-int amd756_getclink __P((pciintr_icu_handle_t, int, int *));
-int amd756_get_intr __P((pciintr_icu_handle_t, int, int *));
-int amd756_set_intr __P((pciintr_icu_handle_t, int, int));
-int amd756_get_trigger __P((pciintr_icu_handle_t, int, int *));
-int amd756_set_trigger __P((pciintr_icu_handle_t, int, int));
+int amd756_getclink(pciintr_icu_handle_t, int, int *);
+int amd756_get_intr(pciintr_icu_handle_t, int, int *);
+int amd756_set_intr(pciintr_icu_handle_t, int, int);
+int amd756_get_trigger(pciintr_icu_handle_t, int, int *);
+int amd756_set_trigger(pciintr_icu_handle_t, int, int);
 #ifdef VIPER_DEBUG
-static void amd756_pir_dump __P((struct viper_handle *));
+static void amd756_pir_dump(struct viper_handle *);
 #endif
 
 const struct pciintr_icu amd756_pci_icu = {
diff --git a/sys/arch/i386/pci/opti82c558.c b/sys/arch/i386/pci/opti82c558.c
index 4fc45b674c4..6a240fb13c0 100644
--- a/sys/arch/i386/pci/opti82c558.c
+++ b/sys/arch/i386/pci/opti82c558.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opti82c558.c,v 1.5 2001/01/25 00:07:40 mickey Exp $	*/
+/*	$OpenBSD: opti82c558.c,v 1.6 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: opti82c558.c,v 1.2 2000/07/18 11:24:09 soda Exp $	*/
 
 /*-
@@ -82,11 +82,11 @@
 #include <i386/pci/pcibiosvar.h>
 #include <i386/pci/opti82c558reg.h>
 
-int	opti82c558_getclink __P((pciintr_icu_handle_t, int, int *));
-int	opti82c558_get_intr __P((pciintr_icu_handle_t, int, int *));
-int	opti82c558_set_intr __P((pciintr_icu_handle_t, int, int));
-int	opti82c558_get_trigger __P((pciintr_icu_handle_t, int, int *));
-int	opti82c558_set_trigger __P((pciintr_icu_handle_t, int, int));
+int	opti82c558_getclink(pciintr_icu_handle_t, int, int *);
+int	opti82c558_get_intr(pciintr_icu_handle_t, int, int *);
+int	opti82c558_set_intr(pciintr_icu_handle_t, int, int);
+int	opti82c558_get_trigger(pciintr_icu_handle_t, int, int *);
+int	opti82c558_set_trigger(pciintr_icu_handle_t, int, int);
 
 const struct pciintr_icu opti82c558_pci_icu = {
 	opti82c558_getclink,
diff --git a/sys/arch/i386/pci/opti82c700.c b/sys/arch/i386/pci/opti82c700.c
index 9b9fb779383..07766921546 100644
--- a/sys/arch/i386/pci/opti82c700.c
+++ b/sys/arch/i386/pci/opti82c700.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opti82c700.c,v 1.5 2001/01/25 00:07:40 mickey Exp $	*/
+/*	$OpenBSD: opti82c700.c,v 1.6 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: opti82c700.c,v 1.2 2000/07/18 11:07:20 soda Exp $	*/
 
 /*-
@@ -88,11 +88,11 @@
 #define	DPRINTF(arg)
 #endif
 
-int	opti82c700_getclink __P((pciintr_icu_handle_t, int, int *));
-int	opti82c700_get_intr __P((pciintr_icu_handle_t, int, int *));
-int	opti82c700_set_intr __P((pciintr_icu_handle_t, int, int));
-int	opti82c700_get_trigger __P((pciintr_icu_handle_t, int, int *));
-int	opti82c700_set_trigger __P((pciintr_icu_handle_t, int, int));
+int	opti82c700_getclink(pciintr_icu_handle_t, int, int *);
+int	opti82c700_get_intr(pciintr_icu_handle_t, int, int *);
+int	opti82c700_set_intr(pciintr_icu_handle_t, int, int);
+int	opti82c700_get_trigger(pciintr_icu_handle_t, int, int *);
+int	opti82c700_set_trigger(pciintr_icu_handle_t, int, int);
 
 const struct pciintr_icu opti82c700_pci_icu = {
 	opti82c700_getclink,
@@ -107,9 +107,9 @@ struct opti82c700_handle {
 	pcitag_t ph_tag;
 };
 
-int	opti82c700_addr __P((int, int *, int *));
+int	opti82c700_addr(int, int *, int *);
 #ifdef FIRESTARDEBUG
-void	opti82c700_pir_dump __P((struct opti82c700_handle *));
+void	opti82c700_pir_dump(struct opti82c700_handle *);
 #endif
 
 int
diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
index 071f940b36f..8c30e8e1cf2 100644
--- a/sys/arch/i386/pci/pchb.c
+++ b/sys/arch/i386/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.28 2001/12/31 23:38:53 mickey Exp $	*/
+/*	$OpenBSD: pchb.c,v 1.29 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pchb.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $	*/
 
 /*
@@ -115,10 +115,10 @@ struct pchb_softc {
 	struct timeout sc_tmo;
 };
 
-int	pchbmatch __P((struct device *, void *, void *));
-void	pchbattach __P((struct device *, struct device *, void *));
+int	pchbmatch(struct device *, void *, void *);
+void	pchbattach(struct device *, struct device *, void *);
 
-int	pchb_print __P((void *, const char *));
+int	pchb_print(void *, const char *);
 
 struct cfattach pchb_ca = {
 	sizeof(struct pchb_softc), pchbmatch, pchbattach
@@ -128,7 +128,7 @@ struct cfdriver pchb_cd = {
 	NULL, "pchb", DV_DULL
 };
 
-void pchb_rnd __P((void *v));
+void pchb_rnd(void *v);
 
 int
 pchbmatch(parent, match, aux)
diff --git a/sys/arch/i386/pci/pci_addr_fixup.c b/sys/arch/i386/pci/pci_addr_fixup.c
index 025e3c1e4d0..bda77df0a85 100644
--- a/sys/arch/i386/pci/pci_addr_fixup.c
+++ b/sys/arch/i386/pci/pci_addr_fixup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_addr_fixup.c,v 1.12 2001/12/04 06:32:06 mickey Exp $	*/
+/*	$OpenBSD: pci_addr_fixup.c,v 1.13 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pci_addr_fixup.c,v 1.7 2000/08/03 20:10:45 nathanw Exp $	*/
 
 /*-
@@ -42,25 +42,24 @@
 
 #include <i386/pci/pcibiosvar.h>
 
-typedef int (*pciaddr_resource_manage_func_t) 
-	__P((struct pcibios_softc *, pci_chipset_tag_t, pcitag_t, int,
-	struct extent *, int, bus_addr_t *, bus_size_t));
-void	pciaddr_resource_manage __P((struct pcibios_softc *,
-    pci_chipset_tag_t, pcitag_t, pciaddr_resource_manage_func_t));
-void	pciaddr_resource_reserve __P((struct pcibios_softc *,
-    pci_chipset_tag_t, pcitag_t));
-int	pciaddr_do_resource_reserve __P((struct pcibios_softc *,
+typedef int (*pciaddr_resource_manage_func_t)(struct pcibios_softc *, pci_chipset_tag_t, pcitag_t, int,
+	struct extent *, int, bus_addr_t *, bus_size_t);
+void	pciaddr_resource_manage(struct pcibios_softc *,
+    pci_chipset_tag_t, pcitag_t, pciaddr_resource_manage_func_t);
+void	pciaddr_resource_reserve(struct pcibios_softc *,
+    pci_chipset_tag_t, pcitag_t);
+int	pciaddr_do_resource_reserve(struct pcibios_softc *,
     pci_chipset_tag_t, pcitag_t, int, struct extent *, int,
-    bus_addr_t *, bus_size_t));
-void	pciaddr_resource_allocate __P((struct pcibios_softc *,
-    pci_chipset_tag_t, pcitag_t));
-int	pciaddr_do_resource_allocate __P((struct pcibios_softc *,
+    bus_addr_t *, bus_size_t);
+void	pciaddr_resource_allocate(struct pcibios_softc *,
+    pci_chipset_tag_t, pcitag_t);
+int	pciaddr_do_resource_allocate(struct pcibios_softc *,
     pci_chipset_tag_t, pcitag_t, int, struct extent *, int, bus_addr_t *,
-    bus_size_t));
-bus_addr_t pciaddr_ioaddr __P((u_int32_t));
-void	pciaddr_print_devid __P((pci_chipset_tag_t, pcitag_t));
+    bus_size_t);
+bus_addr_t pciaddr_ioaddr(u_int32_t);
+void	pciaddr_print_devid(pci_chipset_tag_t, pcitag_t);
 
-int	pciaddr_device_is_agp __P((pci_chipset_tag_t, pcitag_t));
+int	pciaddr_device_is_agp(pci_chipset_tag_t, pcitag_t);
 
 #define PCIADDR_MEM_START	0x0
 #define PCIADDR_MEM_END		0xffffffff
diff --git a/sys/arch/i386/pci/pci_intr_fixup.c b/sys/arch/i386/pci/pci_intr_fixup.c
index 3d975586aa2..a5e2d5c9791 100644
--- a/sys/arch/i386/pci/pci_intr_fixup.c
+++ b/sys/arch/i386/pci/pci_intr_fixup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_intr_fixup.c,v 1.21 2002/02/20 19:01:19 mickey Exp $	*/
+/*	$OpenBSD: pci_intr_fixup.c,v 1.22 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pci_intr_fixup.c,v 1.10 2000/08/10 21:18:27 soda Exp $	*/
 
 /*
@@ -126,18 +126,18 @@ pciintr_icu_handle_t pciintr_icu_handle;
 int pcibios_irqs_hint = PCIBIOS_IRQS_HINT;
 #endif
 
-struct pciintr_link_map *pciintr_link_lookup __P((int));
-struct pcibios_intr_routing *pciintr_pir_lookup __P((int, int));
-int	pciintr_bitmap_count_irq __P((int, int *));
+struct pciintr_link_map *pciintr_link_lookup(int);
+struct pcibios_intr_routing *pciintr_pir_lookup(int, int);
+int	pciintr_bitmap_count_irq(int, int *);
 
 SIMPLEQ_HEAD(, pciintr_link_map) pciintr_link_map_list;
 
 const struct pciintr_icu_table {
 	pci_vendor_id_t	piit_vendor;
 	pci_product_id_t piit_product;
-	int (*piit_init) __P((pci_chipset_tag_t,
+	int (*piit_init)(pci_chipset_tag_t,
 		bus_space_tag_t, pcitag_t, pciintr_icu_tag_t *,
-		pciintr_icu_handle_t *));
+		pciintr_icu_handle_t *);
 } pciintr_icu_table[] = {
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82371MX,
 	  piix_init },
@@ -181,7 +181,7 @@ const struct pciintr_icu_table {
 	  NULL },
 };
 
-const struct pciintr_icu_table *pciintr_icu_lookup __P((pcireg_t));
+const struct pciintr_icu_table *pciintr_icu_lookup(pcireg_t);
 
 const struct pciintr_icu_table *
 pciintr_icu_lookup(id)
diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c
index d0ea039a240..7ac9f5336d3 100644
--- a/sys/arch/i386/pci/pci_machdep.c
+++ b/sys/arch/i386/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.c,v 1.22 2001/11/06 19:53:14 miod Exp $	*/
+/*	$OpenBSD: pci_machdep.c,v 1.23 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $	*/
 
 /*-
@@ -486,7 +486,7 @@ void *
 pci_intr_establish(pc, ih, level, func, arg, what)
 	pci_chipset_tag_t pc;
 	pci_intr_handle_t ih;
-	int level, (*func) __P((void *));
+	int level, (*func)(void *);
 	void *arg;
 	char *what;
 {
diff --git a/sys/arch/i386/pci/pci_machdep.h b/sys/arch/i386/pci/pci_machdep.h
index 911dc7f897a..553136a4529 100644
--- a/sys/arch/i386/pci/pci_machdep.h
+++ b/sys/arch/i386/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.9 2001/08/25 10:13:29 art Exp $	*/
+/*	$OpenBSD: pci_machdep.h,v 1.10 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pci_machdep.h,v 1.7 1997/06/06 23:29:18 thorpej Exp $	*/
 
 /*
@@ -75,28 +75,28 @@ struct {
  * NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE.
  */
 extern int pci_mode;
-int		pci_mode_detect __P((void));
+int		pci_mode_detect(void);
 
 /*
  * Functions provided to machine-independent PCI code.
  */
-void		pci_attach_hook __P((struct device *, struct device *,
-		    struct pcibus_attach_args *));
-int		pci_bus_maxdevs __P((pci_chipset_tag_t, int));
-pcitag_t	pci_make_tag __P((pci_chipset_tag_t, int, int, int));
-pcireg_t	pci_conf_read __P((pci_chipset_tag_t, pcitag_t, int));
-void		pci_conf_write __P((pci_chipset_tag_t, pcitag_t, int,
-		    pcireg_t));
+void		pci_attach_hook(struct device *, struct device *,
+		    struct pcibus_attach_args *);
+int		pci_bus_maxdevs(pci_chipset_tag_t, int);
+pcitag_t	pci_make_tag(pci_chipset_tag_t, int, int, int);
+pcireg_t	pci_conf_read(pci_chipset_tag_t, pcitag_t, int);
+void		pci_conf_write(pci_chipset_tag_t, pcitag_t, int,
+		    pcireg_t);
 struct pci_attach_args;
-int		pci_intr_map __P((struct pci_attach_args *,
-		    pci_intr_handle_t *));
+int		pci_intr_map(struct pci_attach_args *,
+		    pci_intr_handle_t *);
 #define		pci_intr_line(ih)	((ih).line)
-const char	*pci_intr_string __P((pci_chipset_tag_t, pci_intr_handle_t));
+const char	*pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
 void		*pci_intr_establish __P((pci_chipset_tag_t, pci_intr_handle_t,
 		    int, int (*)(void *), void *, char *));
-void		pci_intr_disestablish __P((pci_chipset_tag_t, void *));
-void		pci_decompose_tag __P((pci_chipset_tag_t, pcitag_t,
-		    int *, int *, int *));
+void		pci_intr_disestablish(pci_chipset_tag_t, void *);
+void		pci_decompose_tag(pci_chipset_tag_t, pcitag_t,
+		    int *, int *, int *);
 
 /*
  * Section 6.2.4, `Miscellaneous Functions' of the PIC Specification,
diff --git a/sys/arch/i386/pci/pcib.c b/sys/arch/i386/pci/pcib.c
index be4ef0b37b5..056f67fda5c 100644
--- a/sys/arch/i386/pci/pcib.c
+++ b/sys/arch/i386/pci/pcib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcib.c,v 1.8 2001/01/27 04:59:40 mickey Exp $	*/
+/*	$OpenBSD: pcib.c,v 1.9 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pcib.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $	*/
 
 /*-
@@ -56,10 +56,10 @@
 #include <i386/pci/pcibiosvar.h>
 #endif
 
-int	pcibmatch __P((struct device *, void *, void *));
-void	pcibattach __P((struct device *, struct device *, void *));
-void	pcib_callback __P((struct device *));
-int	pcib_print __P((void *, const char *));
+int	pcibmatch(struct device *, void *, void *);
+void	pcibattach(struct device *, struct device *, void *);
+void	pcib_callback(struct device *);
+int	pcib_print(void *, const char *);
 
 struct cfattach pcib_ca = {
 	sizeof(struct device), pcibmatch, pcibattach
diff --git a/sys/arch/i386/pci/pcibios.c b/sys/arch/i386/pci/pcibios.c
index 9de6e27fcab..b21383c977d 100644
--- a/sys/arch/i386/pci/pcibios.c
+++ b/sys/arch/i386/pci/pcibios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcibios.c,v 1.24 2001/05/12 19:12:44 mickey Exp $	*/
+/*	$OpenBSD: pcibios.c,v 1.25 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pcibios.c,v 1.5 2000/08/01 05:23:59 uch Exp $	*/
 
 /*
@@ -122,18 +122,18 @@ int pcibios_flags = 0;
 struct bios32_entry pcibios_entry;
 struct bios32_entry_info pcibios_entry_info;
 
-struct pcibios_intr_routing *pcibios_pir_init __P((struct pcibios_softc *));
+struct pcibios_intr_routing *pcibios_pir_init(struct pcibios_softc *);
 
-int	pcibios_get_status __P((struct pcibios_softc *,
+int	pcibios_get_status(struct pcibios_softc *,
 	    u_int32_t *, u_int32_t *, u_int32_t *,
-	    u_int32_t *, u_int32_t *, u_int32_t *, u_int32_t *));
-int	pcibios_get_intr_routing __P((struct pcibios_softc *,
-	    struct pcibios_intr_routing *, int *, u_int16_t *));
+	    u_int32_t *, u_int32_t *, u_int32_t *, u_int32_t *);
+int	pcibios_get_intr_routing(struct pcibios_softc *,
+	    struct pcibios_intr_routing *, int *, u_int16_t *);
 
-int	pcibios_return_code __P((struct pcibios_softc *, u_int16_t, const char *));
+int	pcibios_return_code(struct pcibios_softc *, u_int16_t, const char *);
 
-void	pcibios_print_exclirq __P((struct pcibios_softc *));
-void	pcibios_print_pir_table __P((void));
+void	pcibios_print_exclirq(struct pcibios_softc *);
+void	pcibios_print_pir_table(void);
 
 #define	PCI_IRQ_TABLE_START	0xf0000
 #define	PCI_IRQ_TABLE_END	0xfffff
@@ -142,8 +142,8 @@ struct cfdriver pcibios_cd = {
 	NULL, "pcibios", DV_DULL
 };
 
-int pcibiosprobe __P((struct device *, void *, void *));
-void pcibiosattach __P((struct device *, struct device *, void *));
+int pcibiosprobe(struct device *, void *, void *);
+void pcibiosattach(struct device *, struct device *, void *);
 
 struct cfattach pcibios_ca = {
 	sizeof(struct pcibios_softc), pcibiosprobe, pcibiosattach
@@ -524,7 +524,7 @@ pci_device_foreach(sc, pc, maxbus, func)
 	struct pcibios_softc *sc;
 	pci_chipset_tag_t pc;
 	int maxbus;
-	void (*func) __P((struct pcibios_softc *, pci_chipset_tag_t, pcitag_t));
+	void (*func)(struct pcibios_softc *, pci_chipset_tag_t, pcitag_t);
 {
 	const struct pci_quirkdata *qd;
 	int bus, device, function, maxdevs, nfuncs;
diff --git a/sys/arch/i386/pci/pcibiosvar.h b/sys/arch/i386/pci/pcibiosvar.h
index b78e9afdcae..86d377f13c1 100644
--- a/sys/arch/i386/pci/pcibiosvar.h
+++ b/sys/arch/i386/pci/pcibiosvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcibiosvar.h,v 1.8 2001/10/25 19:03:49 mickey Exp $	*/
+/*	$OpenBSD: pcibiosvar.h,v 1.9 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pcibios.h,v 1.2 2000/04/28 17:15:16 uch Exp $	*/
 
 /*
@@ -104,7 +104,7 @@ struct pcibios_pir_header {
 #define	PIR_DEVFUNC_FUNCTION(devfunc)	((devfunc) & 7)
 #define	PIR_DEVFUNC_COMPOSE(dev,func)	((((dev) &0x1f) << 3) | ((func) & 7))
 
-void	pcibios_init __P((void));
+void	pcibios_init(void);
 
 extern struct pcibios_pir_header pcibios_pir_header;
 extern struct pcibios_intr_routing *pcibios_pir_table;
@@ -115,11 +115,11 @@ int pcibios_flags;
 typedef void *pciintr_icu_handle_t;
 
 struct pciintr_icu {
-	int	(*pi_getclink) __P((pciintr_icu_handle_t, int, int *));
-	int	(*pi_get_intr) __P((pciintr_icu_handle_t, int, int *));
-	int	(*pi_set_intr) __P((pciintr_icu_handle_t, int, int));
-	int	(*pi_get_trigger) __P((pciintr_icu_handle_t, int, int *));
-	int	(*pi_set_trigger) __P((pciintr_icu_handle_t, int, int));
+	int	(*pi_getclink)(pciintr_icu_handle_t, int, int *);
+	int	(*pi_get_intr)(pciintr_icu_handle_t, int, int *);
+	int	(*pi_set_intr)(pciintr_icu_handle_t, int, int);
+	int	(*pi_get_trigger)(pciintr_icu_handle_t, int, int *);
+	int	(*pi_set_trigger)(pciintr_icu_handle_t, int, int);
 };
 
 typedef const struct pciintr_icu *pciintr_icu_tag_t;
@@ -143,32 +143,32 @@ typedef const struct pciintr_icu *pciintr_icu_tag_t;
 
 #define	PCIADDR_SEARCH_IO	0
 #define	PCIADDR_SEARCH_MEM	1
-struct extent *pciaddr_search __P((int, bus_addr_t *, bus_size_t));
+struct extent *pciaddr_search(int, bus_addr_t *, bus_size_t);
 
-int  pci_intr_fixup __P((struct pcibios_softc *, pci_chipset_tag_t, bus_space_tag_t));
-int  pci_bus_fixup __P((pci_chipset_tag_t, int));
-void pci_addr_fixup __P((struct pcibios_softc *, pci_chipset_tag_t, int));
+int  pci_intr_fixup(struct pcibios_softc *, pci_chipset_tag_t, bus_space_tag_t);
+int  pci_bus_fixup(pci_chipset_tag_t, int);
+void pci_addr_fixup(struct pcibios_softc *, pci_chipset_tag_t, int);
 void pci_device_foreach __P((struct pcibios_softc *, pci_chipset_tag_t, int,
-    void (*) __P((struct pcibios_softc *, pci_chipset_tag_t, pcitag_t))));
-int  pci_intr_header_fixup __P((pci_chipset_tag_t, pcitag_t, pci_intr_handle_t *));
-int  pci_intr_route_link __P((pci_chipset_tag_t, pci_intr_handle_t *));
-int  pci_intr_post_fixup __P((void));
+    void (*)(struct pcibios_softc *, pci_chipset_tag_t, pcitag_t)));
+int  pci_intr_header_fixup(pci_chipset_tag_t, pcitag_t, pci_intr_handle_t *);
+int  pci_intr_route_link(pci_chipset_tag_t, pci_intr_handle_t *);
+int  pci_intr_post_fixup(void);
 
 /*
  * Init functions for our known PCI ICUs.
  */
-int	piix_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
-	    pciintr_icu_tag_t *, pciintr_icu_handle_t *));
-int	opti82c558_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
-	    pciintr_icu_tag_t *, pciintr_icu_handle_t *));
-int	opti82c700_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
-	    pciintr_icu_tag_t *, pciintr_icu_handle_t *));
-int	via82c586_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
-	    pciintr_icu_tag_t *, pciintr_icu_handle_t *));
-int	sis85c503_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
-	    pciintr_icu_tag_t *, pciintr_icu_handle_t *));
-int	amd756_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
-	    pciintr_icu_tag_t *, pciintr_icu_handle_t *));
-int	ali1543_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
-	    pciintr_icu_tag_t *, pciintr_icu_handle_t *));
+int	piix_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
+	    pciintr_icu_tag_t *, pciintr_icu_handle_t *);
+int	opti82c558_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
+	    pciintr_icu_tag_t *, pciintr_icu_handle_t *);
+int	opti82c700_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
+	    pciintr_icu_tag_t *, pciintr_icu_handle_t *);
+int	via82c586_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
+	    pciintr_icu_tag_t *, pciintr_icu_handle_t *);
+int	sis85c503_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
+	    pciintr_icu_tag_t *, pciintr_icu_handle_t *);
+int	amd756_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
+	    pciintr_icu_tag_t *, pciintr_icu_handle_t *);
+int	ali1543_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t,
+	    pciintr_icu_tag_t *, pciintr_icu_handle_t *);
 
diff --git a/sys/arch/i386/pci/pcic_pci_machdep.c b/sys/arch/i386/pci/pcic_pci_machdep.c
index 4f7e1bbf3ca..1861a31bfc6 100644
--- a/sys/arch/i386/pci/pcic_pci_machdep.c
+++ b/sys/arch/i386/pci/pcic_pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcic_pci_machdep.c,v 1.2 2001/08/17 21:52:16 deraadt Exp $ */
+/*	$OpenBSD: pcic_pci_machdep.c,v 1.3 2002/03/14 01:26:33 millert Exp $ */
 /*	$NetBSD: pcic_pci_machdep.c,v 1.1 1998/12/20 17:53:29 nathanw Exp $	*/
 
 /*
@@ -58,7 +58,7 @@ pcic_pci_machdep_intr_est(pc)
 void *
 pcic_pci_machdep_pcic_intr_establish(sc, fct)
 	struct pcic_softc *sc;
-	int (*fct) __P((void *));
+	int (*fct)(void *);
 {
 	if (isa_intr_alloc(NULL, PCIC_CSC_INTR_IRQ_VALIDMASK & 0xffff,
 			   IST_EDGE, &(sc->irq)))
@@ -73,7 +73,7 @@ pcic_pci_machdep_chip_intr_establish(pch, pf, ipl, fct, arg, xname)
 	pcmcia_chipset_handle_t pch;
 	struct pcmcia_function *pf;
 	int ipl;
-	int (*fct) __P((void *));
+	int (*fct)(void *);
 	void *arg;
 	char *xname;
 {
diff --git a/sys/arch/i386/pci/pciide_machdep.c b/sys/arch/i386/pci/pciide_machdep.c
index fcfdc0f6d8a..072d7b6ba1f 100644
--- a/sys/arch/i386/pci/pciide_machdep.c
+++ b/sys/arch/i386/pci/pciide_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide_machdep.c,v 1.4 2001/06/25 21:42:31 csapuntz Exp $	*/
+/*	$OpenBSD: pciide_machdep.c,v 1.5 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: pciide_machdep.c,v 1.2 1999/02/19 18:01:27 mycroft Exp $	*/
 
 /*
@@ -57,7 +57,7 @@ pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
 	struct device *dev;
 	struct pci_attach_args *pa;
 	int chan;
-	int (*func) __P((void *));
+	int (*func)(void *);
 	void *arg;
 {
 	int irq;
diff --git a/sys/arch/i386/pci/piix.c b/sys/arch/i386/pci/piix.c
index 7d3843e6863..6aec21e7e38 100644
--- a/sys/arch/i386/pci/piix.c
+++ b/sys/arch/i386/pci/piix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: piix.c,v 1.5 2001/01/25 00:07:40 mickey Exp $	*/
+/*	$OpenBSD: piix.c,v 1.6 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: piix.c,v 1.1 1999/11/17 01:21:20 thorpej Exp $	*/
 
 /*-
@@ -89,11 +89,11 @@
 #define	DPRINTF(arg)
 #endif
 
-int	piix_getclink __P((pciintr_icu_handle_t, int, int *));
-int	piix_get_intr __P((pciintr_icu_handle_t, int, int *));
-int	piix_set_intr __P((pciintr_icu_handle_t, int, int));
+int	piix_getclink(pciintr_icu_handle_t, int, int *);
+int	piix_get_intr(pciintr_icu_handle_t, int, int *);
+int	piix_set_intr(pciintr_icu_handle_t, int, int);
 #ifdef PIIX_DEBUG
-void	piix_pir_dump __P((struct piix_handle *));
+void	piix_pir_dump(struct piix_handle *);
 #endif
 
 const struct pciintr_icu piix_pci_icu = {
diff --git a/sys/arch/i386/pci/piixvar.h b/sys/arch/i386/pci/piixvar.h
index a447b5942c5..a7ae9f2a33c 100644
--- a/sys/arch/i386/pci/piixvar.h
+++ b/sys/arch/i386/pci/piixvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: piixvar.h,v 1.4 2000/03/28 03:38:00 mickey Exp $	*/
+/*	$OpenBSD: piixvar.h,v 1.5 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: piixvar.h,v 1.1 1999/11/17 01:21:21 thorpej Exp $	*/
 
 /*-
@@ -67,8 +67,8 @@
  * Support for the Intel PIIX PCI-ISA bridge interrupt controller.
  */
 
-int	piix_get_trigger __P((pciintr_icu_handle_t, int, int *));
-int	piix_set_trigger __P((pciintr_icu_handle_t, int, int));
+int	piix_get_trigger(pciintr_icu_handle_t, int, int *);
+int	piix_set_trigger(pciintr_icu_handle_t, int, int);
 
 struct piix_handle {
 	bus_space_tag_t ph_iot;
diff --git a/sys/arch/i386/pci/sis85c503.c b/sys/arch/i386/pci/sis85c503.c
index 32697ccb144..8e70cb53bb2 100644
--- a/sys/arch/i386/pci/sis85c503.c
+++ b/sys/arch/i386/pci/sis85c503.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sis85c503.c,v 1.5 2001/01/25 00:07:41 mickey Exp $	*/
+/*	$OpenBSD: sis85c503.c,v 1.6 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: sis85c503.c,v 1.2 2000/07/18 11:24:09 soda Exp $	*/
 
 /*-
@@ -82,9 +82,9 @@
 #include <i386/pci/sis85c503reg.h>
 #include <i386/pci/piixvar.h>
 
-int	sis85c503_getclink __P((pciintr_icu_handle_t, int, int *));
-int	sis85c503_get_intr __P((pciintr_icu_handle_t, int, int *));
-int	sis85c503_set_intr __P((pciintr_icu_handle_t, int, int));
+int	sis85c503_getclink(pciintr_icu_handle_t, int, int *);
+int	sis85c503_get_intr(pciintr_icu_handle_t, int, int *);
+int	sis85c503_set_intr(pciintr_icu_handle_t, int, int);
 
 const struct pciintr_icu sis85c503_pci_icu = {
 	sis85c503_getclink,
diff --git a/sys/arch/i386/pci/via82c586.c b/sys/arch/i386/pci/via82c586.c
index 719ad6620d1..6e1137ea241 100644
--- a/sys/arch/i386/pci/via82c586.c
+++ b/sys/arch/i386/pci/via82c586.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: via82c586.c,v 1.8 2001/06/08 03:18:04 mickey Exp $	*/
+/*	$OpenBSD: via82c586.c,v 1.9 2002/03/14 01:26:33 millert Exp $	*/
 /*	$NetBSD: via82c586.c,v 1.2 2000/07/18 11:24:09 soda Exp $	*/
 
 /*-
@@ -82,11 +82,11 @@
 #include <i386/pci/via82c586reg.h>
 #include <i386/pci/piixvar.h>
 
-int	via82c586_getclink __P((pciintr_icu_handle_t, int, int *));
-int	via82c586_get_intr __P((pciintr_icu_handle_t, int, int *));
-int	via82c586_set_intr __P((pciintr_icu_handle_t, int, int));
-int	via82c586_get_trigger __P((pciintr_icu_handle_t, int, int *));
-int	via82c586_set_trigger __P((pciintr_icu_handle_t, int, int));
+int	via82c586_getclink(pciintr_icu_handle_t, int, int *);
+int	via82c586_get_intr(pciintr_icu_handle_t, int, int *);
+int	via82c586_set_intr(pciintr_icu_handle_t, int, int);
+int	via82c586_get_trigger(pciintr_icu_handle_t, int, int *);
+int	via82c586_set_trigger(pciintr_icu_handle_t, int, int);
 
 const struct pciintr_icu via82c586_pci_icu = {
 	via82c586_getclink,
diff --git a/sys/arch/i386/stand/boot/crt0.c b/sys/arch/i386/stand/boot/crt0.c
index 6b9e243aa64..e5af727fde2 100644
--- a/sys/arch/i386/stand/boot/crt0.c
+++ b/sys/arch/i386/stand/boot/crt0.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crt0.c,v 1.3 1998/05/25 19:20:49 mickey Exp $	*/
+/*	$OpenBSD: crt0.c,v 1.4 2002/03/14 01:26:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1997-1998 Michael Shalayeff
@@ -41,11 +41,11 @@
 #include "libsa.h"
 #include <lib/libsa/unixdev.h>
 
-void start __P((void)) asm("start");
-void _rtt __P((void));
-extern int  boot __P((dev_t));
-static void domap __P((void));
-static void seterm __P((void));
+void start(void) asm("start");
+void _rtt(void);
+extern int  boot(dev_t);
+static void domap(void);
+static void seterm(void);
 
 void
 start()
diff --git a/sys/arch/i386/stand/installboot/installboot.c b/sys/arch/i386/stand/installboot/installboot.c
index 2add3ed9762..1122c9fd72f 100644
--- a/sys/arch/i386/stand/installboot/installboot.c
+++ b/sys/arch/i386/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: installboot.c,v 1.35 2001/11/06 19:53:14 miod Exp $	*/
+/*	$OpenBSD: installboot.c,v 1.36 2002/03/14 01:26:34 millert Exp $	*/
 /*	$NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
 
 /*
@@ -77,12 +77,11 @@ int	maxblocknum;		/* size of this array */
 
 int biosdev;
 
-char		*loadprotoblocks __P((char *, long *));
-int		loadblocknums __P((char *, int, struct disklabel *));
-static void	devread __P((int, void *, daddr_t, size_t, char *));
-static void	usage __P((void));
-static int	record_block
-	__P((u_int8_t *, daddr_t, u_int, struct disklabel *));
+char		*loadprotoblocks(char *, long *);
+int		loadblocknums(char *, int, struct disklabel *);
+static void	devread(int, void *, daddr_t, size_t, char *);
+static void	usage(void);
+static int	record_block(u_int8_t *, daddr_t, u_int, struct disklabel *);
 
 static void
 usage()
diff --git a/sys/arch/i386/stand/libsa/biosdev.c b/sys/arch/i386/stand/libsa/biosdev.c
index 84bbf84a81c..db3090fb752 100644
--- a/sys/arch/i386/stand/libsa/biosdev.c
+++ b/sys/arch/i386/stand/libsa/biosdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.c,v 1.52 1998/06/11 02:30:57 mickey Exp $	*/
+/*	$OpenBSD: biosdev.c,v 1.53 2002/03/14 01:26:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -43,8 +43,8 @@
 #include "libsa.h"
 #include "biosdev.h"
 
-static const char *biosdisk_err __P((u_int));
-static int biosdisk_errno __P((u_int));
+static const char *biosdisk_err(u_int);
+static int biosdisk_errno(u_int);
 
 extern int debug;
 
diff --git a/sys/arch/i386/stand/libsa/biosdev.h b/sys/arch/i386/stand/libsa/biosdev.h
index ad523bf686b..675d17c11cc 100644
--- a/sys/arch/i386/stand/libsa/biosdev.h
+++ b/sys/arch/i386/stand/libsa/biosdev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.h,v 1.25 2000/06/08 01:51:33 mickey Exp $	*/
+/*	$OpenBSD: biosdev.h,v 1.26 2002/03/14 01:26:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -37,27 +37,27 @@ struct open_file;
 
 /* biosdev.c */
 extern const char *biosdevs[];
-int biosstrategy __P((void *, int, daddr_t, size_t, void *, size_t *));
-int biosopen __P((struct open_file *, ...));
-int biosclose __P((struct open_file *));
-int biosioctl __P((struct open_file *, u_long, void *));
-int bios_getdiskinfo __P((int, bios_diskinfo_t *));
-int biosd_io __P((int, int, int, int, int, int, void*));
-const char * bios_getdisklabel __P((bios_diskinfo_t *, struct disklabel *));
+int biosstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+int biosopen(struct open_file *, ...);
+int biosclose(struct open_file *);
+int biosioctl(struct open_file *, u_long, void *);
+int bios_getdiskinfo(int, bios_diskinfo_t *);
+int biosd_io(int, int, int, int, int, int, void*);
+const char * bios_getdisklabel(bios_diskinfo_t *, struct disklabel *);
 
 /* diskprobe.c */
-struct diskinfo *dklookup __P((int));
-bios_diskinfo_t *bios_dklookup __P((int));
+struct diskinfo *dklookup(int);
+bios_diskinfo_t *bios_dklookup(int);
 
 /* bioscons.c */
-void pc_probe __P((struct consdev *));
-void pc_init __P((struct consdev *));
-int pc_getc __P((dev_t));
-void pc_putc __P((dev_t, int));
-void pc_pollc __P((dev_t, int));
-void com_probe __P((struct consdev *));
-void com_init __P((struct consdev *));
-int comspeed __P((dev_t, int));
-int com_getc __P((dev_t));
-void com_putc __P((dev_t, int));
-void com_pollc __P((dev_t, int));
+void pc_probe(struct consdev *);
+void pc_init(struct consdev *);
+int pc_getc(dev_t);
+void pc_putc(dev_t, int);
+void pc_pollc(dev_t, int);
+void com_probe(struct consdev *);
+void com_init(struct consdev *);
+int comspeed(dev_t, int);
+int com_getc(dev_t);
+void com_putc(dev_t, int);
+void com_pollc(dev_t, int);
diff --git a/sys/arch/i386/stand/libsa/cmd_i386.c b/sys/arch/i386/stand/libsa/cmd_i386.c
index 69927bd91f4..70c7bb1774e 100644
--- a/sys/arch/i386/stand/libsa/cmd_i386.c
+++ b/sys/arch/i386/stand/libsa/cmd_i386.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd_i386.c,v 1.22 1999/08/25 00:54:19 mickey Exp $	*/
+/*	$OpenBSD: cmd_i386.c,v 1.23 2002/03/14 01:26:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1997-1999 Michael Shalayeff
@@ -46,13 +46,13 @@
 
 extern const char version[];
 
-int Xboot __P((void));
-int Xdiskinfo __P((void));
-int Xmemory __P((void));
-int Xregs __P((void));
+int Xboot(void);
+int Xdiskinfo(void);
+int Xmemory(void);
+int Xregs(void);
 
 /* From gidt.S */
-int bootbuf __P((void*, int));
+int bootbuf(void*, int);
 
 const struct cmd_table cmd_machine[] = {
 	{ "boot",     CMDT_CMD, Xboot },
diff --git a/sys/arch/i386/stand/libsa/debug.c b/sys/arch/i386/stand/libsa/debug.c
index cad1f1d4525..d2374fea76a 100644
--- a/sys/arch/i386/stand/libsa/debug.c
+++ b/sys/arch/i386/stand/libsa/debug.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: debug.c,v 1.7 1998/06/09 13:45:07 mickey Exp $	*/
+/*	$OpenBSD: debug.c,v 1.8 2002/03/14 01:26:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -44,7 +44,7 @@ struct reg reg;
 u_int32_t *const reg_values[] = { REG_VALUES(reg) };
 char *const trap_names[] = { TRAP_NAMES };
 
-void d_putc __P((dev_t, int));
+void d_putc(dev_t, int);
 
 #ifdef DEBUG_DEBUG
 #define	CKPT(c)	(*(u_short volatile *)(VBASE+160) = (0x1700 | (c)))
diff --git a/sys/arch/i386/stand/libsa/debug.h b/sys/arch/i386/stand/libsa/debug.h
index 67fc9addb71..d3bbfb7e821 100644
--- a/sys/arch/i386/stand/libsa/debug.h
+++ b/sys/arch/i386/stand/libsa/debug.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: debug.h,v 1.4 1998/04/18 07:39:45 deraadt Exp $	*/
+/*	$OpenBSD: debug.h,v 1.5 2002/03/14 01:26:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -38,6 +38,6 @@
 extern char  *const reg_names[];
 extern const size_t nregs;
 
-int debug_init __P((void));
-void dump_regs __P((u_int, u_int));
-void dump_mem __P((char *, void *, size_t));
+int debug_init(void);
+void dump_regs(u_int, u_int);
+void dump_mem(char *, void *, size_t);
diff --git a/sys/arch/i386/stand/libsa/disk.h b/sys/arch/i386/stand/libsa/disk.h
index 0b60ed730d2..35a684c5d51 100644
--- a/sys/arch/i386/stand/libsa/disk.h
+++ b/sys/arch/i386/stand/libsa/disk.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disk.h,v 1.1 1997/11/30 21:59:50 mickey Exp $	*/
+/*	$OpenBSD: disk.h,v 1.2 2002/03/14 01:26:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -51,7 +51,7 @@ TAILQ_HEAD(disklist_lh, diskinfo);
 /* Head of this list */
 extern struct diskinfo *bootdev_dip;
 
-void dump_diskinfo __P((void));
+void dump_diskinfo(void);
 
 #endif /* _DISKPROBE_H */
 
diff --git a/sys/arch/i386/stand/libsa/diskprobe.c b/sys/arch/i386/stand/libsa/diskprobe.c
index f01a096083d..1b19b2ec1c5 100644
--- a/sys/arch/i386/stand/libsa/diskprobe.c
+++ b/sys/arch/i386/stand/libsa/diskprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskprobe.c,v 1.17 1999/10/03 20:37:25 ho Exp $	*/
+/*	$OpenBSD: diskprobe.c,v 1.18 2002/03/14 01:26:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -49,7 +49,7 @@
 #define MAX_CKSUMLEN MAXBSIZE / DEV_BSIZE	/* Max # of blks to cksum */
 
 /* Local Prototypes */
-static int disksum __P((int));
+static int disksum(int);
 
 /* List of disk devices we found/probed */
 struct disklist_lh disklist;
diff --git a/sys/arch/i386/stand/libsa/libsa.h b/sys/arch/i386/stand/libsa/libsa.h
index 7520b896174..298aba48ab6 100644
--- a/sys/arch/i386/stand/libsa/libsa.h
+++ b/sys/arch/i386/stand/libsa/libsa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libsa.h,v 1.33 2001/08/18 15:34:17 mickey Exp $	*/
+/*	$OpenBSD: libsa.h,v 1.34 2002/03/14 01:26:34 millert Exp $	*/
 
 /*
  * Copyright (c) 1996-1999 Michael Shalayeff
@@ -38,21 +38,21 @@
 
 #define	DEFAULT_KERNEL_ADDRESS	0x100000
 
-void gateA20 __P((int));
+void gateA20(int);
 
-void smpprobe __P((void));
-void pciprobe __P((void));
-void memprobe __P((void));
-void diskprobe __P((void));
-void apmprobe __P((void));
-void apmcheck __P((void));
-void dump_biosmem __P((bios_memmap_t *));
-int mem_add __P((long, long));
-int mem_delete __P((long, long));
-void mem_pass __P((void));
+void smpprobe(void);
+void pciprobe(void);
+void memprobe(void);
+void diskprobe(void);
+void apmprobe(void);
+void apmcheck(void);
+void dump_biosmem(bios_memmap_t *);
+int mem_add(long, long);
+int mem_delete(long, long);
+void mem_pass(void);
 
-void devboot __P((dev_t, char *));
-void machdep __P((void));
+void devboot(dev_t, char *);
+void machdep(void);
 
 extern const char bdevs[][4];
 extern const int nbdevs;