First round of __P removal in sys

21 files changed, 242 insertions, 243 deletions

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