From f123d5a15aeaa1af9943c45356ecdd5eb4120dee Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Wed, 13 Sep 2006 18:45:12 +0000
Subject: [PATCH] Ansify the rest of the K&R-style function declarations in
 sys/i386.

Those were somehow[tm] forgotten last time.

Noticed-by: corecode

While I'm here, perform some stylistic cleanup in math_emulate.c.
---
 sys/cpu/i386/misc/db_disasm.c           |  22 ++--
 sys/i386/i386/autoconf.c                |  17 ++-
 sys/i386/i386/busdma_machdep.c          |   4 +-
 sys/i386/i386/db_disasm.c               |  22 ++--
 sys/i386/i386/db_interface.c            |  19 +---
 sys/i386/i386/identcpu.c                |   4 +-
 sys/i386/i386/machdep.c                 |  52 +++-------
 sys/i386/i386/math_emulate.c            | 132 ++++++++++++------------
 sys/i386/i386/mem.c                     |  13 +--
 sys/i386/i386/pmap.c                    |   8 +-
 sys/i386/i386/procfs_machdep.c          |  29 ++----
 sys/i386/i386/trap.c                    |  29 ++----
 sys/i386/i386/userconfig.c              |   7 +-
 sys/i386/i386/vm86.c                    |  22 ++--
 sys/i386/i386/vm_machdep.c              |  30 ++----
 sys/i386/isa/ipl_funcs.c                |   5 +-
 sys/i386/isa/prof_machdep.c             |  10 +-
 sys/kern/kern_memio.c                   |  13 +--
 sys/platform/pc32/i386/autoconf.c       |  17 ++-
 sys/platform/pc32/i386/busdma_machdep.c |   4 +-
 sys/platform/pc32/i386/db_disasm.c      |  22 ++--
 sys/platform/pc32/i386/db_interface.c   |  19 +---
 sys/platform/pc32/i386/identcpu.c       |   4 +-
 sys/platform/pc32/i386/machdep.c        |  52 +++-------
 sys/platform/pc32/i386/math_emulate.c   | 132 ++++++++++++------------
 sys/platform/pc32/i386/mem.c            |  13 +--
 sys/platform/pc32/i386/pmap.c           |   8 +-
 sys/platform/pc32/i386/procfs_machdep.c |  29 ++----
 sys/platform/pc32/i386/trap.c           |  29 ++----
 sys/platform/pc32/i386/userconfig.c     |   7 +-
 sys/platform/pc32/i386/vm86.c           |  22 ++--
 sys/platform/pc32/i386/vm_machdep.c     |  30 ++----
 sys/platform/pc32/isa/ipl_funcs.c       |   5 +-
 sys/platform/pc32/isa/prof_machdep.c    |  10 +-
 34 files changed, 314 insertions(+), 527 deletions(-)

diff --git a/sys/cpu/i386/misc/db_disasm.c b/sys/cpu/i386/misc/db_disasm.c
index ae841264ff..2e7fd3b3c4 100644
--- a/sys/cpu/i386/misc/db_disasm.c
+++ b/sys/cpu/i386/misc/db_disasm.c
@@ -24,7 +24,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/i386/i386/db_disasm.c,v 1.23.2.1 2001/07/29 22:48:37 kris Exp $
- * $DragonFly: src/sys/cpu/i386/misc/db_disasm.c,v 1.4 2003/11/08 03:06:52 dillon Exp $
+ * $DragonFly: src/sys/cpu/i386/misc/db_disasm.c,v 1.5 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -875,11 +875,8 @@ static db_addr_t
  * Read address at location and return updated location.
  */
 static db_addr_t
-db_read_address(loc, short_addr, regmodrm, addrp)
-	db_addr_t	loc;
-	int		short_addr;
-	int		regmodrm;
-	struct i_addr *	addrp;		/* out */
+db_read_address(db_addr_t loc, int short_addr, int regmodrm,
+		struct i_addr *addrp)
 {
 	int		mod, rm, sib, index, disp;
 
@@ -977,10 +974,7 @@ db_read_address(loc, short_addr, regmodrm, addrp)
 }
 
 static void
-db_print_address(seg, size, addrp)
-	const char *	seg;
-	int		size;
-	struct i_addr *	addrp;
+db_print_address(const char *seg, int size, struct i_addr *addrp)
 {
 	if (addrp->is_reg) {
 	    db_printf("%s", db_reg[size][addrp->disp]);
@@ -1009,12 +1003,8 @@ db_print_address(seg, size, addrp)
  * and return updated location.
  */
 static db_addr_t
-db_disasm_esc(loc, inst, short_addr, size, seg)
-	db_addr_t	loc;
-	int		inst;
-	int		short_addr;
-	int		size;
-	const char *	seg;
+db_disasm_esc(db_addr_t loc, int inst, int short_addr, int size,
+	      const char *seg)
 {
 	int		regmodrm;
 	const struct finst *	fp;
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 6cc9b4b707..b6443e79f2 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/i386/i386/autoconf.c,v 1.146.2.2 2001/06/07 06:05:58 dd Exp $
- * $DragonFly: src/sys/i386/i386/Attic/autoconf.c,v 1.27 2006/09/10 01:26:38 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/autoconf.c,v 1.28 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -116,14 +116,12 @@ cdev_t	dumpdev = NOCDEV;
  * Determine i/o configuration for a machine.
  */
 static void
-configure_first(dummy)
-	void *dummy;
+configure_first(void *dummy)
 {
 }
 
 static void
-configure(dummy)
-	void *dummy;
+configure(void *dummy)
 {
         /*
 	 * Final interrupt support acviation, then enable hardware interrupts.
@@ -159,8 +157,7 @@ configure(dummy)
 }
 
 static void
-configure_final(dummy)
-	void *dummy;
+configure_final(void *dummy)
 {
 	int i;
 
@@ -213,7 +210,7 @@ void bootpc_init(void);
  * Do legacy root filesystem discovery.
  */
 void
-cpu_rootconf()
+cpu_rootconf(void)
 {
 #ifdef BOOTP
         bootpc_init();
@@ -267,7 +264,7 @@ boot_translate_majdev(int bmajor)
  * 'wd' or 'fd' device, and the root filesystem must be ufs.
  */
 static void
-setroot()
+setroot(void)
 {
 	int majdev, mindev, unit, slice, part;
 	cdev_t newrootdev, dev;
@@ -438,7 +435,7 @@ decode_nfshandle(char *ev, u_char *fh)
  * boot.nfsroot.nfshandle	NFS handle for root filesystem on server
  */
 static void
-pxe_setup_nfsdiskless()
+pxe_setup_nfsdiskless(void)
 {
 	struct nfs_diskless	*nd = &nfs_diskless;
 	struct ifnet		*ifp;
diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index d72b506436..46e954af3d 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.16.2.2 2003/01/23 00:55:27 scottl Exp $
- * $DragonFly: src/sys/i386/i386/Attic/busdma_machdep.c,v 1.15 2006/09/05 03:48:11 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/busdma_machdep.c,v 1.16 2006/09/13 18:45:12 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -876,7 +876,7 @@ free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage)
 }
 
 void
-busdma_swi()
+busdma_swi(void)
 {
 	struct bus_dmamap *map;
 
diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c
index 9882fd1827..03444c8e5f 100644
--- a/sys/i386/i386/db_disasm.c
+++ b/sys/i386/i386/db_disasm.c
@@ -24,7 +24,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/i386/i386/db_disasm.c,v 1.23.2.1 2001/07/29 22:48:37 kris Exp $
- * $DragonFly: src/sys/i386/i386/Attic/db_disasm.c,v 1.4 2003/11/08 03:06:52 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/db_disasm.c,v 1.5 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -875,11 +875,8 @@ static db_addr_t
  * Read address at location and return updated location.
  */
 static db_addr_t
-db_read_address(loc, short_addr, regmodrm, addrp)
-	db_addr_t	loc;
-	int		short_addr;
-	int		regmodrm;
-	struct i_addr *	addrp;		/* out */
+db_read_address(db_addr_t loc, int short_addr, int regmodrm,
+		struct i_addr *addrp)
 {
 	int		mod, rm, sib, index, disp;
 
@@ -977,10 +974,7 @@ db_read_address(loc, short_addr, regmodrm, addrp)
 }
 
 static void
-db_print_address(seg, size, addrp)
-	const char *	seg;
-	int		size;
-	struct i_addr *	addrp;
+db_print_address(const char *seg, int size, struct i_addr *addrp)
 {
 	if (addrp->is_reg) {
 	    db_printf("%s", db_reg[size][addrp->disp]);
@@ -1009,12 +1003,8 @@ db_print_address(seg, size, addrp)
  * and return updated location.
  */
 static db_addr_t
-db_disasm_esc(loc, inst, short_addr, size, seg)
-	db_addr_t	loc;
-	int		inst;
-	int		short_addr;
-	int		size;
-	const char *	seg;
+db_disasm_esc(db_addr_t loc, int inst, int short_addr, int size,
+	      const char *seg)
 {
 	int		regmodrm;
 	const struct finst *	fp;
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index 3e247902c1..51e347aa7f 100644
--- a/sys/i386/i386/db_interface.c
+++ b/sys/i386/i386/db_interface.c
@@ -24,7 +24,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/i386/i386/db_interface.c,v 1.48.2.1 2000/07/07 00:38:46 obrien Exp $
- * $DragonFly: src/sys/i386/i386/Attic/db_interface.c,v 1.12 2005/12/24 20:34:04 swildner Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/db_interface.c,v 1.13 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -65,9 +65,7 @@ static int	db_global_jmpbuf_valid;
  *  kdb_trap - field a TRACE or BPT trap
  */
 int
-kdb_trap(type, code, regs)
-	int	type, code;
-	struct i386_saved_state *regs;
+kdb_trap(int type, int code, struct i386_saved_state *regs)
 {
 	volatile int ddb_mode = !(boothowto & RB_GDB);
 
@@ -198,10 +196,7 @@ kdb_trap(type, code, regs)
  * Read bytes from kernel address space for debugger.
  */
 void
-db_read_bytes(addr, size, data)
-	vm_offset_t	addr;
-	size_t	size;
-	char	*data;
+db_read_bytes(vm_offset_t addr, size_t size, char *data)
 {
 	char	*src;
 
@@ -218,10 +213,7 @@ db_read_bytes(addr, size, data)
  * Write bytes to kernel address space for debugger.
  */
 void
-db_write_bytes(addr, size, data)
-	vm_offset_t	addr;
-	size_t	size;
-	char	*data;
+db_write_bytes(vm_offset_t addr, size_t size, char *data)
 {
 	char	*dst;
 
@@ -317,8 +309,7 @@ BP_REGS(db_regs_t *regs)
  * installed.
  */
 void
-Debugger(msg)
-	const char *msg;
+Debugger(const char *msg)
 {
 	static volatile u_char in_Debugger;
 
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index dd9ef4117e..0fbff430ef 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -39,7 +39,7 @@
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
  * $FreeBSD: src/sys/i386/i386/identcpu.c,v 1.80.2.15 2003/04/11 17:06:41 jhb Exp $
- * $DragonFly: src/sys/i386/i386/Attic/identcpu.c,v 1.10 2006/05/11 16:44:43 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/identcpu.c,v 1.11 2006/09/13 18:45:12 swildner Exp $
  */
 
 #include "opt_cpu.h"
@@ -1279,7 +1279,7 @@ setup_tmx86_longrun(void)
 }
 
 static void
-print_transmeta_info()
+print_transmeta_info(void)
 {
 	u_int regs[4], nreg = 0;
 
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index b4546e0881..af08a0787d 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -36,7 +36,7 @@
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
  * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.385.2.30 2003/05/31 08:48:05 alc Exp $
- * $DragonFly: src/sys/i386/i386/Attic/machdep.c,v 1.96 2006/09/10 01:26:39 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/machdep.c,v 1.97 2006/09/13 18:45:12 swildner Exp $
  */
 
 #include "use_apm.h"
@@ -245,8 +245,7 @@ static vm_offset_t pager_sva, pager_eva;
 static struct trapframe proc0_tf;
 
 static void
-cpu_startup(dummy)
-	void *dummy;
+cpu_startup(void *dummy)
 {
 	caddr_t v;
 	vm_offset_t minaddr;
@@ -417,11 +416,7 @@ again:
  * specified pc, psl.
  */
 void
-sendsig(catcher, sig, mask, code)
-	sig_t catcher;
-	int sig;
-	sigset_t *mask;
-	u_long code;
+sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code)
 {
 	struct lwp *lp = curthread->td_lwp;
 	struct proc *p = lp->lwp_proc;
@@ -882,11 +877,7 @@ cpu_idle(void)
  * Clear registers on exec
  */
 void
-setregs(p, entry, stack, ps_strings)
-	struct proc *p;
-	u_long entry;
-	u_long stack;
-	u_long ps_strings;
+setregs(struct proc *p, u_long entry, u_long stack, u_long ps_strings)
 {
 	struct trapframe *regs = p->p_md.md_regs;
 	struct pcb *pcb = p->p_thread->td_pcb;
@@ -1258,12 +1249,7 @@ static struct soft_segment_descriptor ldt_segs[] = {
 };
 
 void
-setidt(idx, func, typ, dpl, selec)
-	int idx;
-	inthand_t *func;
-	int typ;
-	int dpl;
-	int selec;
+setidt(int idx, inthand_t *func, int typ, int dpl, int selec)
 {
 	struct gate_descriptor *ip;
 
@@ -1295,9 +1281,7 @@ extern inthand_t *Xrsvdary[256];
 #endif
 
 void
-sdtossd(sd, ssd)
-	struct segment_descriptor *sd;
-	struct soft_segment_descriptor *ssd;
+sdtossd(struct segment_descriptor *sd, struct soft_segment_descriptor *ssd)
 {
 	ssd->ssd_base  = (sd->sd_hibase << 24) | sd->sd_lobase;
 	ssd->ssd_limit = (sd->sd_hilimit << 16) | sd->sd_lolimit;
@@ -2106,9 +2090,7 @@ f00f_hack(void *unused)
 #endif /* defined(I586_CPU) && !NO_F00F_HACK */
 
 int
-ptrace_set_pc(p, addr)
-	struct proc *p;
-	unsigned long addr;
+ptrace_set_pc(struct proc *p, unsigned long addr)
 {
 	p->p_md.md_regs->tf_eip = addr;
 	return (0);
@@ -2121,10 +2103,8 @@ ptrace_single_step(struct lwp *lp)
 	return (0);
 }
 
-int ptrace_read_u_check(p, addr, len)
-	struct proc *p;
-	vm_offset_t addr;
-	size_t len;
+int
+ptrace_read_u_check(struct proc *p, vm_offset_t addr, size_t len)
 {
 	vm_offset_t gap;
 
@@ -2143,10 +2123,8 @@ int ptrace_read_u_check(p, addr, len)
 	return EPERM;
 }
 
-int ptrace_write_u(p, off, data)
-	struct proc *p;
-	vm_offset_t off;
-	long data;
+int
+ptrace_write_u(struct proc *p, vm_offset_t off, long data)
 {
 	struct trapframe frame_copy;
 	vm_offset_t min;
@@ -2239,9 +2217,7 @@ set_regs(struct lwp *lp, struct reg *regs)
 
 #ifndef CPU_DISABLE_SSE
 static void
-fill_fpregs_xmm(sv_xmm, sv_87)
-	struct savexmm *sv_xmm;
-	struct save87 *sv_87;
+fill_fpregs_xmm(struct savexmm *sv_xmm, struct save87 *sv_87)
 {
 	struct env87 *penv_87 = &sv_87->sv_env;
 	struct envxmm *penv_xmm = &sv_xmm->sv_env;
@@ -2265,9 +2241,7 @@ fill_fpregs_xmm(sv_xmm, sv_87)
 }
 
 static void
-set_fpregs_xmm(sv_87, sv_xmm)
-	struct save87 *sv_87;
-	struct savexmm *sv_xmm;
+set_fpregs_xmm(struct save87 *sv_87, struct savexmm *sv_xmm)
 {
 	struct env87 *penv_87 = &sv_87->sv_env;
 	struct envxmm *penv_xmm = &sv_xmm->sv_env;
diff --git a/sys/i386/i386/math_emulate.c b/sys/i386/i386/math_emulate.c
index 8a318e0424..4597f32c43 100644
--- a/sys/i386/i386/math_emulate.c
+++ b/sys/i386/i386/math_emulate.c
@@ -7,7 +7,7 @@
  *
  *	from: 386BSD 0.1
  * $FreeBSD: src/sys/i386/i386/math_emulate.c,v 1.35 1999/08/28 00:43:47 peter Exp $
- * $DragonFly: src/sys/i386/i386/Attic/math_emulate.c,v 1.4 2003/06/18 18:29:55 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/math_emulate.c,v 1.5 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -64,8 +64,8 @@
  */
 static void fpop(void);
 static void fpush(void);
-static void fxchg(temp_real_unaligned * a, temp_real_unaligned * b);
-static temp_real_unaligned * __st(int i);
+static void fxchg(temp_real_unaligned *a, temp_real_unaligned *b);
+static temp_real_unaligned *__st(int i);
 
 static unsigned char
 get_fs_byte(char *adr) 
@@ -92,11 +92,11 @@ put_fs_long(u_long val, u_int32_t *adr)
 	{ (void)suword(adr,val); }
 
 static int
-math_emulate(struct trapframe * info)
+math_emulate(struct trapframe *info)
 {
 	unsigned short code;
 	temp_real tmp;
-	char * address;
+	char *address;
 	u_int32_t oldeip;
 
 	/* ever used fp? */
@@ -574,7 +574,7 @@ fpush(void)
 }
 
 static void 
-fxchg(temp_real_unaligned * a, temp_real_unaligned * b)
+fxchg(temp_real_unaligned *a, temp_real_unaligned *b)
 {
 	temp_real_unaligned c;
 
@@ -609,7 +609,7 @@ static int __regoffset[] = {
 #define REG(x) (((int *)curproc->p_md.md_regs)[__regoffset[(x)]])
 
 static char *
-sib(struct trapframe * info, int mod)
+sib(struct trapframe *info, int mod)
 {
 	unsigned char ss,index,base;
 	int32_t offset = 0;
@@ -639,10 +639,10 @@ sib(struct trapframe * info, int mod)
 }
 
 static char *
-ea(struct trapframe * info, unsigned short code)
+ea(struct trapframe *info, unsigned short code)
 {
 	unsigned char mod,rm;
-	int32_t * tmp;
+	int32_t *tmp;
 	int offset = 0;
 
 	mod = (code >> 6) & 3;
@@ -689,9 +689,9 @@ ea(struct trapframe * info, unsigned short code)
  */
 
 static void 
-get_short_real(temp_real * tmp, struct trapframe * info, unsigned short code)
+get_short_real(temp_real *tmp, struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	short_real sr;
 
 	addr = ea(info,code);
@@ -700,9 +700,9 @@ get_short_real(temp_real * tmp, struct trapframe * info, unsigned short code)
 }
 
 static void
-get_long_real(temp_real * tmp, struct trapframe * info, unsigned short code)
+get_long_real(temp_real *tmp, struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	long_real lr;
 
 	addr = ea(info,code);
@@ -712,9 +712,9 @@ get_long_real(temp_real * tmp, struct trapframe * info, unsigned short code)
 }
 
 static void
-get_temp_real(temp_real * tmp, struct trapframe * info, unsigned short code)
+get_temp_real(temp_real *tmp, struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 
 	addr = ea(info,code);
 	tmp->a = get_fs_long((u_int32_t *) addr);
@@ -723,9 +723,9 @@ get_temp_real(temp_real * tmp, struct trapframe * info, unsigned short code)
 }
 
 static void
-get_short_int(temp_real * tmp, struct trapframe * info, unsigned short code)
+get_short_int(temp_real *tmp, struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	temp_int ti;
 
 	addr = ea(info,code);
@@ -737,9 +737,9 @@ get_short_int(temp_real * tmp, struct trapframe * info, unsigned short code)
 }
 
 static void
-get_long_int(temp_real * tmp, struct trapframe * info, unsigned short code)
+get_long_int(temp_real *tmp, struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	temp_int ti;
 
 	addr = ea(info,code);
@@ -751,9 +751,9 @@ get_long_int(temp_real * tmp, struct trapframe * info, unsigned short code)
 }
 
 static void 
-get_longlong_int(temp_real * tmp, struct trapframe * info, unsigned short code)
+get_longlong_int(temp_real *tmp, struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	temp_int ti;
 
 	addr = ea(info,code);
@@ -781,10 +781,10 @@ __asm__("addl %4,%0 ; adcl $0,%1":"=r" (low),"=r" (high) \
 :"0" (low),"1" (high),"r" ((u_int32_t) (val)))
 
 static void
-get_BCD(temp_real * tmp, struct trapframe * info, unsigned short code)
+get_BCD(temp_real *tmp, struct trapframe *info, unsigned short code)
 {
 	int k;
-	char * addr;
+	char *addr;
 	temp_int i;
 	unsigned char c;
 
@@ -803,10 +803,10 @@ get_BCD(temp_real * tmp, struct trapframe * info, unsigned short code)
 }
 
 static void 
-put_short_real(const temp_real * tmp,
-	struct trapframe * info, unsigned short code)
+put_short_real(const temp_real *tmp,
+	struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	short_real sr;
 
 	addr = ea(info,code);
@@ -816,10 +816,10 @@ put_short_real(const temp_real * tmp,
 }
 
 static void
-put_long_real(const temp_real * tmp,
-	struct trapframe * info, unsigned short code)
+put_long_real(const temp_real *tmp,
+	struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	long_real lr;
 
 	addr = ea(info,code);
@@ -830,10 +830,10 @@ put_long_real(const temp_real * tmp,
 }
 
 static void
-put_temp_real(const temp_real * tmp,
-	struct trapframe * info, unsigned short code)
+put_temp_real(const temp_real *tmp,
+	struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 
 	addr = ea(info,code);
 	/*verify_area(addr,10);*/
@@ -843,10 +843,10 @@ put_temp_real(const temp_real * tmp,
 }
 
 static void
-put_short_int(const temp_real * tmp,
-	struct trapframe * info, unsigned short code)
+put_short_int(const temp_real *tmp,
+	struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	temp_int ti;
 
 	addr = ea(info,code);
@@ -858,10 +858,10 @@ put_short_int(const temp_real * tmp,
 }
 
 static void
-put_long_int(const temp_real * tmp,
-	struct trapframe * info, unsigned short code)
+put_long_int(const temp_real *tmp,
+	struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	temp_int ti;
 
 	addr = ea(info,code);
@@ -873,10 +873,10 @@ put_long_int(const temp_real * tmp,
 }
 
 static void
-put_longlong_int(const temp_real * tmp,
-	struct trapframe * info, unsigned short code)
+put_longlong_int(const temp_real *tmp,
+	struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	temp_int ti;
 
 	addr = ea(info,code);
@@ -897,10 +897,10 @@ __asm__("divl %6 ; xchgl %1,%2 ; divl %6" \
 	:"0" (0),"1" (high),"2" (low),"c" (10))
 
 static void
-put_BCD(const temp_real * tmp,struct trapframe * info, unsigned short code)
+put_BCD(const temp_real *tmp,struct trapframe *info, unsigned short code)
 {
 	int k,rem;
-	char * addr;
+	char *addr;
 	temp_int i;
 	unsigned char c;
 
@@ -932,7 +932,7 @@ put_BCD(const temp_real * tmp,struct trapframe * info, unsigned short code)
 
 
 static void
-shift(int * c)
+shift(int *c)
 {
 	__asm__("movl (%0),%%eax ; addl %%eax,(%0)\n\t"
 		"movl 4(%0),%%eax ; adcl %%eax,4(%0)\n\t"
@@ -942,7 +942,7 @@ shift(int * c)
 }
 
 static void
-mul64(const temp_real * a, const temp_real * b, int * c)
+mul64(const temp_real *a, const temp_real *b, int *c)
 {
 	__asm__("movl (%0),%%eax\n\t"
 		"mull (%1)\n\t"
@@ -967,7 +967,7 @@ mul64(const temp_real * a, const temp_real * b, int * c)
 }
 
 static void
-fmul(const temp_real * src1, const temp_real * src2, temp_real * result)
+fmul(const temp_real *src1, const temp_real *src2, temp_real *result)
 {
 	int i,sign;
 	int tmp[4] = {0,0,0,0};
@@ -1007,7 +1007,7 @@ fmul(const temp_real * src1, const temp_real * src2, temp_real * result)
  */
 
 static void 
-shift_left(int * c)
+shift_left(int *c)
 {
 	__asm__ __volatile__("movl (%0),%%eax ; addl %%eax,(%0)\n\t"
 		"movl 4(%0),%%eax ; adcl %%eax,4(%0)\n\t"
@@ -1017,14 +1017,14 @@ shift_left(int * c)
 }
 
 static void
-shift_right(int * c)
+shift_right(int *c)
 {
 	__asm__("shrl $1,12(%0) ; rcrl $1,8(%0) ; rcrl $1,4(%0) ; rcrl $1,(%0)"
 		::"r" (c));
 }
 
 static int
-try_sub(int * a, int * b)
+try_sub(int *a, int *b)
 {
 	char ok;
 
@@ -1037,7 +1037,7 @@ try_sub(int * a, int * b)
 }
 
 static void
-div64(int * a, int * b, int * c)
+div64(int *a, int *b, int *c)
 {
 	int tmp[4];
 	int i;
@@ -1061,7 +1061,7 @@ div64(int * a, int * b, int * c)
 }
 
 static void
-fdiv(const temp_real * src1, const temp_real * src2, temp_real * result)
+fdiv(const temp_real *src1, const temp_real *src2, temp_real *result)
 {
 	int i,sign;
 	int a[4],b[4],tmp[4] = {0,0,0,0};
@@ -1133,7 +1133,8 @@ __asm__("notl %0 ; notl %1 ; addl $1,%0 ; adcl $0,%1" \
 	:"=r" (a->a),"=r" (a->b) \
 	:"0" (a->a),"1" (a->b))
 
-static void signify(temp_real * a)
+static void
+signify(temp_real *a)
 {
 	a->exponent += 2;
 	__asm__("shrdl $2,%1,%0 ; shrl $2,%1"
@@ -1144,7 +1145,8 @@ static void signify(temp_real * a)
 	a->exponent &= 0x7fff;
 }
 
-static void unsignify(temp_real * a)
+static void
+unsignify(temp_real *a)
 {
 	if (!(a->a || a->b)) {
 		a->exponent = 0;
@@ -1164,7 +1166,7 @@ static void unsignify(temp_real * a)
 }
 
 static void
-fadd(const temp_real * src1, const temp_real * src2, temp_real * result)
+fadd(const temp_real *src1, const temp_real *src2, temp_real *result)
 {
 	temp_real a,b;
 	int x1,x2,shift;
@@ -1215,7 +1217,7 @@ fadd(const temp_real * src1, const temp_real * src2, temp_real * result)
 #define clear_Cx() (I387.swd &= ~0x4500)
 
 static void 
-normalize(temp_real * a)
+normalize(temp_real *a)
 {
 	int i = a->exponent & 0x7fff;
 	int sign = a->exponent & 0x8000;
@@ -1234,7 +1236,7 @@ normalize(temp_real * a)
 }
 
 static void
-ftst(const temp_real * a)
+ftst(const temp_real *a)
 {
 	temp_real b;
 
@@ -1249,7 +1251,7 @@ ftst(const temp_real * a)
 }
 
 static void
-fcom(const temp_real * src1, const temp_real * src2)
+fcom(const temp_real *src1, const temp_real *src2)
 {
 	temp_real a;
 
@@ -1260,7 +1262,7 @@ fcom(const temp_real * src1, const temp_real * src2)
 }
 
 static void
-fucom(const temp_real * src1, const temp_real * src2)
+fucom(const temp_real *src1, const temp_real *src2)
 {
 	fcom(src1,src2);
 }
@@ -1285,7 +1287,7 @@ fucom(const temp_real * src1, const temp_real * src2)
  */
 
 static void
-short_to_temp(const short_real * a, temp_real * b)
+short_to_temp(const short_real *a, temp_real *b)
 {
 	if (!(*a & 0x7fffffff)) {
 		b->a = b->b = 0;
@@ -1303,7 +1305,7 @@ short_to_temp(const short_real * a, temp_real * b)
 }
 
 static void
-long_to_temp(const long_real * a, temp_real * b)
+long_to_temp(const long_real *a, temp_real *b)
 {
 	if (!a->a && !(a->b & 0x7fffffff)) {
 		b->a = b->b = 0;
@@ -1321,7 +1323,7 @@ long_to_temp(const long_real * a, temp_real * b)
 }
 
 static void 
-temp_to_short(const temp_real * a, short_real * b)
+temp_to_short(const temp_real *a, short_real *b)
 {
 	if (!(a->exponent & 0x7fff)) {
 		*b = (a->exponent)?0x80000000UL:0;
@@ -1348,7 +1350,7 @@ temp_to_short(const temp_real * a, short_real * b)
 }
 
 static void
-temp_to_long(const temp_real * a, long_real * b)
+temp_to_long(const temp_real *a, long_real *b)
 {
 	if (!(a->exponent & 0x7fff)) {
 		b->a = 0;
@@ -1385,7 +1387,7 @@ temp_to_long(const temp_real * a, long_real * b)
 }
 
 static void 
-frndint(const temp_real * a, temp_real * b)
+frndint(const temp_real *a, temp_real *b)
 {
 	int shift =  16383 + 63 - (a->exponent & 0x7fff);
 	u_int32_t underflow;
@@ -1470,7 +1472,7 @@ Fscale(const temp_real *a, const temp_real *b, temp_real *c)
 }
 
 static void
-real_to_int(const temp_real * a, temp_int * b)
+real_to_int(const temp_real *a, temp_int *b)
 {
 	int shift =  16383 + 63 - (a->exponent & 0x7fff);
 	u_int32_t underflow;
@@ -1526,7 +1528,7 @@ real_to_int(const temp_real * a, temp_int * b)
 }
 
 static void
-int_to_real(const temp_int * a, temp_real * b)
+int_to_real(const temp_int *a, temp_real *b)
 {
 	b->a = a->a;
 	b->b = a->b;
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 357e624493..6ff7470ef5 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -39,7 +39,7 @@
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/i386/i386/mem.c,v 1.79.2.9 2003/01/04 22:58:01 njl Exp $
- * $DragonFly: src/sys/i386/i386/Attic/mem.c,v 1.20 2006/09/10 01:26:39 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/mem.c,v 1.21 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -424,9 +424,7 @@ mem_ioctl(cdev_t dev, u_long cmd, caddr_t data, int flags, struct ucred *cred)
  * memory range attributes.
  */
 int
-mem_range_attr_get(mrd, arg)
-	struct mem_range_desc *mrd;
-	int *arg;
+mem_range_attr_get(struct mem_range_desc *mrd, int *arg)
 {
 	/* can we handle this? */
 	if (mem_range_softc.mr_op == NULL)
@@ -441,9 +439,7 @@ mem_range_attr_get(mrd, arg)
 }
 
 int
-mem_range_attr_set(mrd, arg)
-	struct mem_range_desc *mrd;
-	int *arg;
+mem_range_attr_set(struct mem_range_desc *mrd, int *arg)
 {
 	/* can we handle this? */
 	if (mem_range_softc.mr_op == NULL)
@@ -534,8 +530,7 @@ mmpoll(struct dev_poll_args *ap)
 }
 
 int
-iszerodev(dev)
-	cdev_t dev;
+iszerodev(cdev_t dev)
 {
 	return ((major(dev) == mem_ops.head.maj)
 	  && minor(dev) == 12);
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 0414cd7b83..c2fb131387 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -40,7 +40,7 @@
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
  * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.250.2.18 2002/03/06 22:48:53 silby Exp $
- * $DragonFly: src/sys/i386/i386/Attic/pmap.c,v 1.56 2006/09/12 22:03:10 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/pmap.c,v 1.57 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -304,9 +304,7 @@ pmap_pte_quick(pmap_t pmap, vm_offset_t va)
  *	(physical) address starting relative to 0]
  */
 void
-pmap_bootstrap(firstaddr, loadaddr)
-	vm_paddr_t firstaddr;
-	vm_paddr_t loadaddr;
+pmap_bootstrap(vm_paddr_t firstaddr, vm_paddr_t loadaddr)
 {
 	vm_offset_t va;
 	pt_entry_t *pte;
@@ -544,7 +542,7 @@ pmap_init(void)
  * numbers of pv entries.
  */
 void
-pmap_init2()
+pmap_init2(void)
 {
 	int shpgperproc = PMAP_SHPGPERPROC;
 
diff --git a/sys/i386/i386/procfs_machdep.c b/sys/i386/i386/procfs_machdep.c
index 1d66c44609..b45c7ff1df 100644
--- a/sys/i386/i386/procfs_machdep.c
+++ b/sys/i386/i386/procfs_machdep.c
@@ -38,7 +38,7 @@
  *
  * From:
  * $FreeBSD: src/sys/i386/i386/procfs_machdep.c,v 1.14 1999/10/11 14:50:03 peter Exp $
- * $DragonFly: src/sys/i386/i386/Attic/procfs_machdep.c,v 1.5 2005/11/14 18:50:03 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/procfs_machdep.c,v 1.6 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -82,9 +82,7 @@
 #include <vm/vm_map.h>
 
 int
-procfs_read_regs(p, regs)
-	struct proc *p;
-	struct reg *regs;
+procfs_read_regs(struct proc *p, struct reg *regs)
 {
 	if (p->p_flag & P_SWAPPEDOUT)
 		return (EIO);
@@ -92,9 +90,7 @@ procfs_read_regs(p, regs)
 }
 
 int
-procfs_write_regs(p, regs)
-	struct proc *p;
-	struct reg *regs;
+procfs_write_regs(struct proc *p, struct reg *regs)
 {
 	if (p->p_flag & P_SWAPPEDOUT)
 		return (EIO);
@@ -102,9 +98,7 @@ procfs_write_regs(p, regs)
 }
 
 int
-procfs_read_dbregs(p, dbregs)
-	struct proc *p;
-	struct dbreg *dbregs;
+procfs_read_dbregs(struct proc *p, struct dbreg *dbregs)
 {
 	if (p->p_flag & P_SWAPPEDOUT)
 		return (EIO);
@@ -112,9 +106,7 @@ procfs_read_dbregs(p, dbregs)
 }
 
 int
-procfs_write_dbregs(p, dbregs)
-	struct proc *p;
-	struct dbreg *dbregs;
+procfs_write_dbregs(struct proc *p, struct dbreg *dbregs)
 {
 	if (p->p_flag & P_SWAPPEDOUT)
 		return (EIO);
@@ -127,9 +119,7 @@ procfs_write_dbregs(p, dbregs)
  */
 
 int
-procfs_read_fpregs(p, fpregs)
-	struct proc *p;
-	struct fpreg *fpregs;
+procfs_read_fpregs(struct proc *p, struct fpreg *fpregs)
 {
 	if (p->p_flag & P_SWAPPEDOUT)
 		return (EIO);
@@ -137,9 +127,7 @@ procfs_read_fpregs(p, fpregs)
 }
 
 int
-procfs_write_fpregs(p, fpregs)
-	struct proc *p;
-	struct fpreg *fpregs;
+procfs_write_fpregs(struct proc *p, struct fpreg *fpregs)
 {
 	if (p->p_flag & P_SWAPPEDOUT)
 		return (EIO);
@@ -147,8 +135,7 @@ procfs_write_fpregs(p, fpregs)
 }
 
 int
-procfs_sstep(p)
-	struct proc *p;
+procfs_sstep(struct proc *p)
 {
 	if (p->p_flag & P_SWAPPEDOUT)
 		return (EIO);
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index e0178f99c6..9ea6913b1f 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -36,7 +36,7 @@
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
  * $FreeBSD: src/sys/i386/i386/trap.c,v 1.147.2.11 2003/02/27 19:09:59 luoqi Exp $
- * $DragonFly: src/sys/i386/i386/Attic/trap.c,v 1.79 2006/09/03 18:29:16 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/trap.c,v 1.80 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -370,8 +370,7 @@ userexit(struct lwp *lp)
  */
 
 void
-trap(frame)
-	struct trapframe frame;
+trap(struct trapframe frame)
 {
 	struct globaldata *gd = mycpu;
 	struct thread *td = gd->gd_curthread;
@@ -878,10 +877,7 @@ out2:	;
  * to be made safe is the process tracing/debugging code.
  */
 static int
-trap_pfault(frame, usermode, eva)
-	struct trapframe *frame;
-	int usermode;
-	vm_offset_t eva;
+trap_pfault(struct trapframe *frame, int usermode, vm_offset_t eva)
 {
 	vm_offset_t va;
 	struct vmspace *vm = NULL;
@@ -983,10 +979,7 @@ nogo:
 #endif
 
 int
-trap_pfault(frame, usermode, eva)
-	struct trapframe *frame;
-	int usermode;
-	vm_offset_t eva;
+trap_pfault(struct trapframe *frame, int usermode, vm_offset_t eva)
 {
 	vm_offset_t va;
 	struct vmspace *vm = NULL;
@@ -1091,9 +1084,7 @@ nogo:
 }
 
 static void
-trap_fatal(frame, eva)
-	struct trapframe *frame;
-	vm_offset_t eva;
+trap_fatal(struct trapframe *frame, vm_offset_t eva)
 {
 	int code, type, ss, esp;
 	struct soft_segment_descriptor softseg;
@@ -1198,7 +1189,7 @@ trap_fatal(frame, eva)
  * of this is that "trace <ebp>" in ddb won't work.
  */
 void
-dblfault_handler()
+dblfault_handler(void)
 {
 	struct mdglobaldata *gd = mdcpu;
 
@@ -1221,8 +1212,8 @@ dblfault_handler()
  * it the page tables have already been faulted in and high addresses
  * are thrown out early for other reasons.
  */
-int trapwrite(addr)
-	unsigned addr;
+int
+trapwrite(unsigned addr)
 {
 	struct proc *p;
 	vm_offset_t va;
@@ -1489,9 +1480,7 @@ bad:
  * trampoline code which then runs doreti.
  */
 void
-fork_return(p, frame)
-	struct proc *p;
-	struct trapframe frame;
+fork_return(struct proc *p, struct trapframe frame)
 {
 	struct lwp *lp;
 
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 7d62c6b05e..61742aba31 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -47,7 +47,7 @@
  ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  **
  ** $FreeBSD: src/sys/i386/i386/userconfig.c,v 1.175.2.10 2002/10/05 18:31:48 scottl Exp $
- ** $DragonFly: src/sys/i386/i386/Attic/userconfig.c,v 1.7 2006/09/05 00:55:45 dillon Exp $
+ ** $DragonFly: src/sys/i386/i386/Attic/userconfig.c,v 1.8 2006/09/13 18:45:12 swildner Exp $
  **/
 
 /**
@@ -3117,7 +3117,7 @@ introfunc(CmdParm *parms)
 
 #if NPNP > 0
 static int
-lspnp ()
+lspnp(void)
 {
     struct pnp_cinfo *c;
     int i, first = 1;
@@ -3409,8 +3409,7 @@ save_resource(struct uc_device *idev)
 }
 
 static int
-save_dev(idev)
-struct uc_device 	*idev;
+save_dev(struct uc_device *idev)
 {
 	struct uc_device	*id_p,*id_pn;
 	char *name = idev->id_name;
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index c5915868ea..2bfd8e52af 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/i386/vm86.c,v 1.31.2.2 2001/10/05 06:18:55 peter Exp $
- * $DragonFly: src/sys/i386/i386/Attic/vm86.c,v 1.19 2006/09/05 00:55:45 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/vm86.c,v 1.20 2006/09/13 18:45:12 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -169,8 +169,7 @@ POPL(struct vm86frame *vmf)
  * MPSAFE
  */
 int
-vm86_emulate(vmf)
-	struct vm86frame *vmf;
+vm86_emulate(struct vm86frame *vmf)
 {
 	struct vm86_kernel *vm86;
 	caddr_t addr;
@@ -656,10 +655,7 @@ vm86_intcall(int intnum, struct vm86frame *vmf)
  * caller's cs:ip routine.  
  */
 int
-vm86_datacall(intnum, vmf, vmc)
-	int intnum;
-	struct vm86frame *vmf;
-	struct vm86context *vmc;
+vm86_datacall(int intnum, struct vm86frame *vmf, struct vm86context *vmc)
 {
 	pt_entry_t *pte = vm86paddr;
 	u_int page;
@@ -687,10 +683,7 @@ vm86_datacall(intnum, vmf, vmc)
 }
 
 vm_offset_t
-vm86_getaddr(vmc, sel, off)
-	struct vm86context *vmc;
-	u_short sel;
-	u_short off;
+vm86_getaddr(struct vm86context *vmc, u_short sel, u_short off)
 {
 	int i, page;
 	vm_offset_t addr;
@@ -704,11 +697,8 @@ vm86_getaddr(vmc, sel, off)
 }
 
 int
-vm86_getptr(vmc, kva, sel, off)
-	struct vm86context *vmc;
-	vm_offset_t kva;
-	u_short *sel;
-	u_short *off;
+vm86_getptr(struct vm86context *vmc, vm_offset_t kva, u_short *sel,
+	    u_short *off)
 {
 	int i;
 
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index cac662e667..c5342ad020 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -39,7 +39,7 @@
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
  * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.132.2.9 2003/01/25 19:02:23 dillon Exp $
- * $DragonFly: src/sys/i386/i386/Attic/vm_machdep.c,v 1.44 2006/09/05 00:55:45 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/vm_machdep.c,v 1.45 2006/09/13 18:45:12 swildner Exp $
  */
 
 #include "use_npx.h"
@@ -96,9 +96,7 @@ extern int	_ucodesel, _udatasel;
  * ready to run and return to user mode.
  */
 void
-cpu_fork(p1, p2, flags)
-	struct proc *p1, *p2;
-	int flags;
+cpu_fork(struct proc *p1, struct proc *p2, int flags)
 {
 	struct pcb *pcb2;
 
@@ -216,10 +214,7 @@ cpu_fork(p1, p2, flags)
  * This is needed to make kernel threads stay in kernel mode.
  */
 void
-cpu_set_fork_handler(p, func, arg)
-	struct proc *p;
-	void (*func) (void *);
-	void *arg;
+cpu_set_fork_handler(struct proc *p, void (*func)(void *), void *arg)
 {
 	/*
 	 * Note that the trap frame follows the args, so the function
@@ -346,9 +341,7 @@ cpu_coredump(struct thread *td, struct vnode *vp, struct ucred *cred)
 
 #ifdef notyet
 static void
-setredzone(pte, vaddr)
-	u_short *pte;
-	caddr_t vaddr;
+setredzone(u_short *pte, caddr_t vaddr)
 {
 /* eventually do this by setting up an expand-down stack segment
    for ss0: selector, allowing stack access down to top of u.
@@ -381,7 +374,7 @@ kvtop(void *addr)
 
 #ifdef SMP
 static void
-cpu_reset_proxy()
+cpu_reset_proxy(void)
 {
 	u_int saved_mp_lock;
 
@@ -402,7 +395,7 @@ cpu_reset_proxy()
 #endif
 
 void
-cpu_reset()
+cpu_reset(void)
 {
 #ifdef SMP
 	if (smp_active_mask == 1) {
@@ -458,7 +451,7 @@ cpu_reset()
 }
 
 static void
-cpu_reset_real()
+cpu_reset_real(void)
 {
 	/*
 	 * Attempt to do a CPU reset via the keyboard controller,
@@ -482,9 +475,7 @@ cpu_reset_real()
 }
 
 int
-grow_stack(p, sp)
-	struct proc *p;
-	u_int sp;
+grow_stack(struct proc *p, u_int sp)
 {
 	int rv;
 
@@ -511,7 +502,7 @@ SYSCTL_INT(_vm_stats_misc, OID_AUTO,
 #define ZIDLE_HI(v)	((v) * 4 / 5)
 
 int
-vm_page_zero_idle()
+vm_page_zero_idle(void)
 {
 	static int free_rover;
 	static int zero_state;
@@ -598,8 +589,7 @@ SYSINIT(vm_setup, SI_SUB_CPU, SI_ORDER_ANY, swi_vm_setup, NULL);
  */
 
 int
-is_physical_memory(addr)
-	vm_offset_t addr;
+is_physical_memory(vm_offset_t addr)
 {
 
 #if NISA > 0
diff --git a/sys/i386/isa/ipl_funcs.c b/sys/i386/isa/ipl_funcs.c
index 88d01692e9..96a0c78035 100644
--- a/sys/i386/isa/ipl_funcs.c
+++ b/sys/i386/isa/ipl_funcs.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/ipl_funcs.c,v 1.32.2.5 2002/12/17 18:04:02 sam Exp $
- * $DragonFly: src/sys/i386/isa/Attic/ipl_funcs.c,v 1.11 2005/11/02 22:59:47 dillon Exp $
+ * $DragonFly: src/sys/i386/isa/Attic/ipl_funcs.c,v 1.12 2006/09/13 18:45:12 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -45,7 +45,8 @@
  * Note: setbits uses a locked or, making simple cases MP safe.
  */
 #define DO_SETBITS(name, var, bits) 					\
-void name(void)								\
+void									\
+name(void)								\
 {									\
 	struct mdglobaldata *gd = mdcpu;				\
 	atomic_set_int_nonlocked(var, bits);				\
diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c
index d77f914c16..3ef1666eff 100644
--- a/sys/i386/isa/prof_machdep.c
+++ b/sys/i386/isa/prof_machdep.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/prof_machdep.c,v 1.14.2.1 2000/08/03 00:09:30 ps Exp $
- * $DragonFly: src/sys/i386/isa/Attic/prof_machdep.c,v 1.5 2005/02/27 12:44:43 asmodai Exp $
+ * $DragonFly: src/sys/i386/isa/Attic/prof_machdep.c,v 1.6 2006/09/13 18:45:12 swildner Exp $
  */
 
 #ifdef GUPROF
@@ -180,7 +180,7 @@ GMON_PROF_HIRES	=	4					\n\
  * dependent.
  */
 int
-cputime()
+cputime(void)
 {
 	u_int count;
 	int delta;
@@ -290,8 +290,7 @@ SYSCTL_PROC(_machdep, OID_AUTO, cputime_clock, CTLTYPE_INT | CTLFLAG_RW,
  */
 
 void
-startguprof(gp)
-	struct gmonparam *gp;
+startguprof(struct gmonparam *gp)
 {
 	if (cputime_clock == CPUTIME_CLOCK_UNINITIALIZED) {
 		cputime_clock = CPUTIME_CLOCK_I8254;
@@ -336,8 +335,7 @@ startguprof(gp)
 }
 
 void
-stopguprof(gp)
-	struct gmonparam *gp;
+stopguprof(struct gmonparam *gp)
 {
 #if defined(PERFMON) && defined(I586_PMC_GUPROF)
 	if (cputime_clock_pmc_init) {
diff --git a/sys/kern/kern_memio.c b/sys/kern/kern_memio.c
index 7b83bde6fa..c9ac7384c9 100644
--- a/sys/kern/kern_memio.c
+++ b/sys/kern/kern_memio.c
@@ -39,7 +39,7 @@
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/i386/i386/mem.c,v 1.79.2.9 2003/01/04 22:58:01 njl Exp $
- * $DragonFly: src/sys/kern/kern_memio.c,v 1.20 2006/09/10 01:26:39 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_memio.c,v 1.21 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -424,9 +424,7 @@ mem_ioctl(cdev_t dev, u_long cmd, caddr_t data, int flags, struct ucred *cred)
  * memory range attributes.
  */
 int
-mem_range_attr_get(mrd, arg)
-	struct mem_range_desc *mrd;
-	int *arg;
+mem_range_attr_get(struct mem_range_desc *mrd, int *arg)
 {
 	/* can we handle this? */
 	if (mem_range_softc.mr_op == NULL)
@@ -441,9 +439,7 @@ mem_range_attr_get(mrd, arg)
 }
 
 int
-mem_range_attr_set(mrd, arg)
-	struct mem_range_desc *mrd;
-	int *arg;
+mem_range_attr_set(struct mem_range_desc *mrd, int *arg)
 {
 	/* can we handle this? */
 	if (mem_range_softc.mr_op == NULL)
@@ -534,8 +530,7 @@ mmpoll(struct dev_poll_args *ap)
 }
 
 int
-iszerodev(dev)
-	cdev_t dev;
+iszerodev(cdev_t dev)
 {
 	return ((major(dev) == mem_ops.head.maj)
 	  && minor(dev) == 12);
diff --git a/sys/platform/pc32/i386/autoconf.c b/sys/platform/pc32/i386/autoconf.c
index 3db106840d..467ab188f9 100644
--- a/sys/platform/pc32/i386/autoconf.c
+++ b/sys/platform/pc32/i386/autoconf.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/i386/i386/autoconf.c,v 1.146.2.2 2001/06/07 06:05:58 dd Exp $
- * $DragonFly: src/sys/platform/pc32/i386/autoconf.c,v 1.27 2006/09/10 01:26:38 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/autoconf.c,v 1.28 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -116,14 +116,12 @@ cdev_t	dumpdev = NOCDEV;
  * Determine i/o configuration for a machine.
  */
 static void
-configure_first(dummy)
-	void *dummy;
+configure_first(void *dummy)
 {
 }
 
 static void
-configure(dummy)
-	void *dummy;
+configure(void *dummy)
 {
         /*
 	 * Final interrupt support acviation, then enable hardware interrupts.
@@ -159,8 +157,7 @@ configure(dummy)
 }
 
 static void
-configure_final(dummy)
-	void *dummy;
+configure_final(void *dummy)
 {
 	int i;
 
@@ -213,7 +210,7 @@ void bootpc_init(void);
  * Do legacy root filesystem discovery.
  */
 void
-cpu_rootconf()
+cpu_rootconf(void)
 {
 #ifdef BOOTP
         bootpc_init();
@@ -267,7 +264,7 @@ boot_translate_majdev(int bmajor)
  * 'wd' or 'fd' device, and the root filesystem must be ufs.
  */
 static void
-setroot()
+setroot(void)
 {
 	int majdev, mindev, unit, slice, part;
 	cdev_t newrootdev, dev;
@@ -438,7 +435,7 @@ decode_nfshandle(char *ev, u_char *fh)
  * boot.nfsroot.nfshandle	NFS handle for root filesystem on server
  */
 static void
-pxe_setup_nfsdiskless()
+pxe_setup_nfsdiskless(void)
 {
 	struct nfs_diskless	*nd = &nfs_diskless;
 	struct ifnet		*ifp;
diff --git a/sys/platform/pc32/i386/busdma_machdep.c b/sys/platform/pc32/i386/busdma_machdep.c
index fa92c09399..e3c2d33277 100644
--- a/sys/platform/pc32/i386/busdma_machdep.c
+++ b/sys/platform/pc32/i386/busdma_machdep.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.16.2.2 2003/01/23 00:55:27 scottl Exp $
- * $DragonFly: src/sys/platform/pc32/i386/busdma_machdep.c,v 1.15 2006/09/05 03:48:11 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/busdma_machdep.c,v 1.16 2006/09/13 18:45:12 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -876,7 +876,7 @@ free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage)
 }
 
 void
-busdma_swi()
+busdma_swi(void)
 {
 	struct bus_dmamap *map;
 
diff --git a/sys/platform/pc32/i386/db_disasm.c b/sys/platform/pc32/i386/db_disasm.c
index 67ce65e1c2..9ee2a65641 100644
--- a/sys/platform/pc32/i386/db_disasm.c
+++ b/sys/platform/pc32/i386/db_disasm.c
@@ -24,7 +24,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/i386/i386/db_disasm.c,v 1.23.2.1 2001/07/29 22:48:37 kris Exp $
- * $DragonFly: src/sys/platform/pc32/i386/Attic/db_disasm.c,v 1.4 2003/11/08 03:06:52 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/Attic/db_disasm.c,v 1.5 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -875,11 +875,8 @@ static db_addr_t
  * Read address at location and return updated location.
  */
 static db_addr_t
-db_read_address(loc, short_addr, regmodrm, addrp)
-	db_addr_t	loc;
-	int		short_addr;
-	int		regmodrm;
-	struct i_addr *	addrp;		/* out */
+db_read_address(db_addr_t loc, int short_addr, int regmodrm,
+		struct i_addr *addrp)
 {
 	int		mod, rm, sib, index, disp;
 
@@ -977,10 +974,7 @@ db_read_address(loc, short_addr, regmodrm, addrp)
 }
 
 static void
-db_print_address(seg, size, addrp)
-	const char *	seg;
-	int		size;
-	struct i_addr *	addrp;
+db_print_address(const char *seg, int size, struct i_addr *addrp)
 {
 	if (addrp->is_reg) {
 	    db_printf("%s", db_reg[size][addrp->disp]);
@@ -1009,12 +1003,8 @@ db_print_address(seg, size, addrp)
  * and return updated location.
  */
 static db_addr_t
-db_disasm_esc(loc, inst, short_addr, size, seg)
-	db_addr_t	loc;
-	int		inst;
-	int		short_addr;
-	int		size;
-	const char *	seg;
+db_disasm_esc(db_addr_t loc, int inst, int short_addr, int size,
+	      const char *seg)
 {
 	int		regmodrm;
 	const struct finst *	fp;
diff --git a/sys/platform/pc32/i386/db_interface.c b/sys/platform/pc32/i386/db_interface.c
index df97efd649..d66bc743ba 100644
--- a/sys/platform/pc32/i386/db_interface.c
+++ b/sys/platform/pc32/i386/db_interface.c
@@ -24,7 +24,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/i386/i386/db_interface.c,v 1.48.2.1 2000/07/07 00:38:46 obrien Exp $
- * $DragonFly: src/sys/platform/pc32/i386/db_interface.c,v 1.12 2005/12/24 20:34:04 swildner Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/db_interface.c,v 1.13 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -65,9 +65,7 @@ static int	db_global_jmpbuf_valid;
  *  kdb_trap - field a TRACE or BPT trap
  */
 int
-kdb_trap(type, code, regs)
-	int	type, code;
-	struct i386_saved_state *regs;
+kdb_trap(int type, int code, struct i386_saved_state *regs)
 {
 	volatile int ddb_mode = !(boothowto & RB_GDB);
 
@@ -198,10 +196,7 @@ kdb_trap(type, code, regs)
  * Read bytes from kernel address space for debugger.
  */
 void
-db_read_bytes(addr, size, data)
-	vm_offset_t	addr;
-	size_t	size;
-	char	*data;
+db_read_bytes(vm_offset_t addr, size_t size, char *data)
 {
 	char	*src;
 
@@ -218,10 +213,7 @@ db_read_bytes(addr, size, data)
  * Write bytes to kernel address space for debugger.
  */
 void
-db_write_bytes(addr, size, data)
-	vm_offset_t	addr;
-	size_t	size;
-	char	*data;
+db_write_bytes(vm_offset_t addr, size_t size, char *data)
 {
 	char	*dst;
 
@@ -317,8 +309,7 @@ BP_REGS(db_regs_t *regs)
  * installed.
  */
 void
-Debugger(msg)
-	const char *msg;
+Debugger(const char *msg)
 {
 	static volatile u_char in_Debugger;
 
diff --git a/sys/platform/pc32/i386/identcpu.c b/sys/platform/pc32/i386/identcpu.c
index 2da02af797..b5c91919c1 100644
--- a/sys/platform/pc32/i386/identcpu.c
+++ b/sys/platform/pc32/i386/identcpu.c
@@ -39,7 +39,7 @@
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
  * $FreeBSD: src/sys/i386/i386/identcpu.c,v 1.80.2.15 2003/04/11 17:06:41 jhb Exp $
- * $DragonFly: src/sys/platform/pc32/i386/identcpu.c,v 1.10 2006/05/11 16:44:43 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/identcpu.c,v 1.11 2006/09/13 18:45:12 swildner Exp $
  */
 
 #include "opt_cpu.h"
@@ -1279,7 +1279,7 @@ setup_tmx86_longrun(void)
 }
 
 static void
-print_transmeta_info()
+print_transmeta_info(void)
 {
 	u_int regs[4], nreg = 0;
 
diff --git a/sys/platform/pc32/i386/machdep.c b/sys/platform/pc32/i386/machdep.c
index d7bec2082a..bcdbc88ad6 100644
--- a/sys/platform/pc32/i386/machdep.c
+++ b/sys/platform/pc32/i386/machdep.c
@@ -36,7 +36,7 @@
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
  * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.385.2.30 2003/05/31 08:48:05 alc Exp $
- * $DragonFly: src/sys/platform/pc32/i386/machdep.c,v 1.96 2006/09/10 01:26:39 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/machdep.c,v 1.97 2006/09/13 18:45:12 swildner Exp $
  */
 
 #include "use_apm.h"
@@ -245,8 +245,7 @@ static vm_offset_t pager_sva, pager_eva;
 static struct trapframe proc0_tf;
 
 static void
-cpu_startup(dummy)
-	void *dummy;
+cpu_startup(void *dummy)
 {
 	caddr_t v;
 	vm_offset_t minaddr;
@@ -417,11 +416,7 @@ again:
  * specified pc, psl.
  */
 void
-sendsig(catcher, sig, mask, code)
-	sig_t catcher;
-	int sig;
-	sigset_t *mask;
-	u_long code;
+sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code)
 {
 	struct lwp *lp = curthread->td_lwp;
 	struct proc *p = lp->lwp_proc;
@@ -882,11 +877,7 @@ cpu_idle(void)
  * Clear registers on exec
  */
 void
-setregs(p, entry, stack, ps_strings)
-	struct proc *p;
-	u_long entry;
-	u_long stack;
-	u_long ps_strings;
+setregs(struct proc *p, u_long entry, u_long stack, u_long ps_strings)
 {
 	struct trapframe *regs = p->p_md.md_regs;
 	struct pcb *pcb = p->p_thread->td_pcb;
@@ -1258,12 +1249,7 @@ static struct soft_segment_descriptor ldt_segs[] = {
 };
 
 void
-setidt(idx, func, typ, dpl, selec)
-	int idx;
-	inthand_t *func;
-	int typ;
-	int dpl;
-	int selec;
+setidt(int idx, inthand_t *func, int typ, int dpl, int selec)
 {
 	struct gate_descriptor *ip;
 
@@ -1295,9 +1281,7 @@ extern inthand_t *Xrsvdary[256];
 #endif
 
 void
-sdtossd(sd, ssd)
-	struct segment_descriptor *sd;
-	struct soft_segment_descriptor *ssd;
+sdtossd(struct segment_descriptor *sd, struct soft_segment_descriptor *ssd)
 {
 	ssd->ssd_base  = (sd->sd_hibase << 24) | sd->sd_lobase;
 	ssd->ssd_limit = (sd->sd_hilimit << 16) | sd->sd_lolimit;
@@ -2106,9 +2090,7 @@ f00f_hack(void *unused)
 #endif /* defined(I586_CPU) && !NO_F00F_HACK */
 
 int
-ptrace_set_pc(p, addr)
-	struct proc *p;
-	unsigned long addr;
+ptrace_set_pc(struct proc *p, unsigned long addr)
 {
 	p->p_md.md_regs->tf_eip = addr;
 	return (0);
@@ -2121,10 +2103,8 @@ ptrace_single_step(struct lwp *lp)
 	return (0);
 }
 
-int ptrace_read_u_check(p, addr, len)
-	struct proc *p;
-	vm_offset_t addr;
-	size_t len;
+int
+ptrace_read_u_check(struct proc *p, vm_offset_t addr, size_t len)
 {
 	vm_offset_t gap;
 
@@ -2143,10 +2123,8 @@ int ptrace_read_u_check(p, addr, len)
 	return EPERM;
 }
 
-int ptrace_write_u(p, off, data)
-	struct proc *p;
-	vm_offset_t off;
-	long data;
+int
+ptrace_write_u(struct proc *p, vm_offset_t off, long data)
 {
 	struct trapframe frame_copy;
 	vm_offset_t min;
@@ -2239,9 +2217,7 @@ set_regs(struct lwp *lp, struct reg *regs)
 
 #ifndef CPU_DISABLE_SSE
 static void
-fill_fpregs_xmm(sv_xmm, sv_87)
-	struct savexmm *sv_xmm;
-	struct save87 *sv_87;
+fill_fpregs_xmm(struct savexmm *sv_xmm, struct save87 *sv_87)
 {
 	struct env87 *penv_87 = &sv_87->sv_env;
 	struct envxmm *penv_xmm = &sv_xmm->sv_env;
@@ -2265,9 +2241,7 @@ fill_fpregs_xmm(sv_xmm, sv_87)
 }
 
 static void
-set_fpregs_xmm(sv_87, sv_xmm)
-	struct save87 *sv_87;
-	struct savexmm *sv_xmm;
+set_fpregs_xmm(struct save87 *sv_87, struct savexmm *sv_xmm)
 {
 	struct env87 *penv_87 = &sv_87->sv_env;
 	struct envxmm *penv_xmm = &sv_xmm->sv_env;
diff --git a/sys/platform/pc32/i386/math_emulate.c b/sys/platform/pc32/i386/math_emulate.c
index 19503db1d4..91d84777e7 100644
--- a/sys/platform/pc32/i386/math_emulate.c
+++ b/sys/platform/pc32/i386/math_emulate.c
@@ -7,7 +7,7 @@
  *
  *	from: 386BSD 0.1
  * $FreeBSD: src/sys/i386/i386/math_emulate.c,v 1.35 1999/08/28 00:43:47 peter Exp $
- * $DragonFly: src/sys/platform/pc32/i386/math_emulate.c,v 1.4 2003/06/18 18:29:55 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/math_emulate.c,v 1.5 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -64,8 +64,8 @@
  */
 static void fpop(void);
 static void fpush(void);
-static void fxchg(temp_real_unaligned * a, temp_real_unaligned * b);
-static temp_real_unaligned * __st(int i);
+static void fxchg(temp_real_unaligned *a, temp_real_unaligned *b);
+static temp_real_unaligned *__st(int i);
 
 static unsigned char
 get_fs_byte(char *adr) 
@@ -92,11 +92,11 @@ put_fs_long(u_long val, u_int32_t *adr)
 	{ (void)suword(adr,val); }
 
 static int
-math_emulate(struct trapframe * info)
+math_emulate(struct trapframe *info)
 {
 	unsigned short code;
 	temp_real tmp;
-	char * address;
+	char *address;
 	u_int32_t oldeip;
 
 	/* ever used fp? */
@@ -574,7 +574,7 @@ fpush(void)
 }
 
 static void 
-fxchg(temp_real_unaligned * a, temp_real_unaligned * b)
+fxchg(temp_real_unaligned *a, temp_real_unaligned *b)
 {
 	temp_real_unaligned c;
 
@@ -609,7 +609,7 @@ static int __regoffset[] = {
 #define REG(x) (((int *)curproc->p_md.md_regs)[__regoffset[(x)]])
 
 static char *
-sib(struct trapframe * info, int mod)
+sib(struct trapframe *info, int mod)
 {
 	unsigned char ss,index,base;
 	int32_t offset = 0;
@@ -639,10 +639,10 @@ sib(struct trapframe * info, int mod)
 }
 
 static char *
-ea(struct trapframe * info, unsigned short code)
+ea(struct trapframe *info, unsigned short code)
 {
 	unsigned char mod,rm;
-	int32_t * tmp;
+	int32_t *tmp;
 	int offset = 0;
 
 	mod = (code >> 6) & 3;
@@ -689,9 +689,9 @@ ea(struct trapframe * info, unsigned short code)
  */
 
 static void 
-get_short_real(temp_real * tmp, struct trapframe * info, unsigned short code)
+get_short_real(temp_real *tmp, struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	short_real sr;
 
 	addr = ea(info,code);
@@ -700,9 +700,9 @@ get_short_real(temp_real * tmp, struct trapframe * info, unsigned short code)
 }
 
 static void
-get_long_real(temp_real * tmp, struct trapframe * info, unsigned short code)
+get_long_real(temp_real *tmp, struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	long_real lr;
 
 	addr = ea(info,code);
@@ -712,9 +712,9 @@ get_long_real(temp_real * tmp, struct trapframe * info, unsigned short code)
 }
 
 static void
-get_temp_real(temp_real * tmp, struct trapframe * info, unsigned short code)
+get_temp_real(temp_real *tmp, struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 
 	addr = ea(info,code);
 	tmp->a = get_fs_long((u_int32_t *) addr);
@@ -723,9 +723,9 @@ get_temp_real(temp_real * tmp, struct trapframe * info, unsigned short code)
 }
 
 static void
-get_short_int(temp_real * tmp, struct trapframe * info, unsigned short code)
+get_short_int(temp_real *tmp, struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	temp_int ti;
 
 	addr = ea(info,code);
@@ -737,9 +737,9 @@ get_short_int(temp_real * tmp, struct trapframe * info, unsigned short code)
 }
 
 static void
-get_long_int(temp_real * tmp, struct trapframe * info, unsigned short code)
+get_long_int(temp_real *tmp, struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	temp_int ti;
 
 	addr = ea(info,code);
@@ -751,9 +751,9 @@ get_long_int(temp_real * tmp, struct trapframe * info, unsigned short code)
 }
 
 static void 
-get_longlong_int(temp_real * tmp, struct trapframe * info, unsigned short code)
+get_longlong_int(temp_real *tmp, struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	temp_int ti;
 
 	addr = ea(info,code);
@@ -781,10 +781,10 @@ __asm__("addl %4,%0 ; adcl $0,%1":"=r" (low),"=r" (high) \
 :"0" (low),"1" (high),"r" ((u_int32_t) (val)))
 
 static void
-get_BCD(temp_real * tmp, struct trapframe * info, unsigned short code)
+get_BCD(temp_real *tmp, struct trapframe *info, unsigned short code)
 {
 	int k;
-	char * addr;
+	char *addr;
 	temp_int i;
 	unsigned char c;
 
@@ -803,10 +803,10 @@ get_BCD(temp_real * tmp, struct trapframe * info, unsigned short code)
 }
 
 static void 
-put_short_real(const temp_real * tmp,
-	struct trapframe * info, unsigned short code)
+put_short_real(const temp_real *tmp,
+	struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	short_real sr;
 
 	addr = ea(info,code);
@@ -816,10 +816,10 @@ put_short_real(const temp_real * tmp,
 }
 
 static void
-put_long_real(const temp_real * tmp,
-	struct trapframe * info, unsigned short code)
+put_long_real(const temp_real *tmp,
+	struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	long_real lr;
 
 	addr = ea(info,code);
@@ -830,10 +830,10 @@ put_long_real(const temp_real * tmp,
 }
 
 static void
-put_temp_real(const temp_real * tmp,
-	struct trapframe * info, unsigned short code)
+put_temp_real(const temp_real *tmp,
+	struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 
 	addr = ea(info,code);
 	/*verify_area(addr,10);*/
@@ -843,10 +843,10 @@ put_temp_real(const temp_real * tmp,
 }
 
 static void
-put_short_int(const temp_real * tmp,
-	struct trapframe * info, unsigned short code)
+put_short_int(const temp_real *tmp,
+	struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	temp_int ti;
 
 	addr = ea(info,code);
@@ -858,10 +858,10 @@ put_short_int(const temp_real * tmp,
 }
 
 static void
-put_long_int(const temp_real * tmp,
-	struct trapframe * info, unsigned short code)
+put_long_int(const temp_real *tmp,
+	struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	temp_int ti;
 
 	addr = ea(info,code);
@@ -873,10 +873,10 @@ put_long_int(const temp_real * tmp,
 }
 
 static void
-put_longlong_int(const temp_real * tmp,
-	struct trapframe * info, unsigned short code)
+put_longlong_int(const temp_real *tmp,
+	struct trapframe *info, unsigned short code)
 {
-	char * addr;
+	char *addr;
 	temp_int ti;
 
 	addr = ea(info,code);
@@ -897,10 +897,10 @@ __asm__("divl %6 ; xchgl %1,%2 ; divl %6" \
 	:"0" (0),"1" (high),"2" (low),"c" (10))
 
 static void
-put_BCD(const temp_real * tmp,struct trapframe * info, unsigned short code)
+put_BCD(const temp_real *tmp,struct trapframe *info, unsigned short code)
 {
 	int k,rem;
-	char * addr;
+	char *addr;
 	temp_int i;
 	unsigned char c;
 
@@ -932,7 +932,7 @@ put_BCD(const temp_real * tmp,struct trapframe * info, unsigned short code)
 
 
 static void
-shift(int * c)
+shift(int *c)
 {
 	__asm__("movl (%0),%%eax ; addl %%eax,(%0)\n\t"
 		"movl 4(%0),%%eax ; adcl %%eax,4(%0)\n\t"
@@ -942,7 +942,7 @@ shift(int * c)
 }
 
 static void
-mul64(const temp_real * a, const temp_real * b, int * c)
+mul64(const temp_real *a, const temp_real *b, int *c)
 {
 	__asm__("movl (%0),%%eax\n\t"
 		"mull (%1)\n\t"
@@ -967,7 +967,7 @@ mul64(const temp_real * a, const temp_real * b, int * c)
 }
 
 static void
-fmul(const temp_real * src1, const temp_real * src2, temp_real * result)
+fmul(const temp_real *src1, const temp_real *src2, temp_real *result)
 {
 	int i,sign;
 	int tmp[4] = {0,0,0,0};
@@ -1007,7 +1007,7 @@ fmul(const temp_real * src1, const temp_real * src2, temp_real * result)
  */
 
 static void 
-shift_left(int * c)
+shift_left(int *c)
 {
 	__asm__ __volatile__("movl (%0),%%eax ; addl %%eax,(%0)\n\t"
 		"movl 4(%0),%%eax ; adcl %%eax,4(%0)\n\t"
@@ -1017,14 +1017,14 @@ shift_left(int * c)
 }
 
 static void
-shift_right(int * c)
+shift_right(int *c)
 {
 	__asm__("shrl $1,12(%0) ; rcrl $1,8(%0) ; rcrl $1,4(%0) ; rcrl $1,(%0)"
 		::"r" (c));
 }
 
 static int
-try_sub(int * a, int * b)
+try_sub(int *a, int *b)
 {
 	char ok;
 
@@ -1037,7 +1037,7 @@ try_sub(int * a, int * b)
 }
 
 static void
-div64(int * a, int * b, int * c)
+div64(int *a, int *b, int *c)
 {
 	int tmp[4];
 	int i;
@@ -1061,7 +1061,7 @@ div64(int * a, int * b, int * c)
 }
 
 static void
-fdiv(const temp_real * src1, const temp_real * src2, temp_real * result)
+fdiv(const temp_real *src1, const temp_real *src2, temp_real *result)
 {
 	int i,sign;
 	int a[4],b[4],tmp[4] = {0,0,0,0};
@@ -1133,7 +1133,8 @@ __asm__("notl %0 ; notl %1 ; addl $1,%0 ; adcl $0,%1" \
 	:"=r" (a->a),"=r" (a->b) \
 	:"0" (a->a),"1" (a->b))
 
-static void signify(temp_real * a)
+static void
+signify(temp_real *a)
 {
 	a->exponent += 2;
 	__asm__("shrdl $2,%1,%0 ; shrl $2,%1"
@@ -1144,7 +1145,8 @@ static void signify(temp_real * a)
 	a->exponent &= 0x7fff;
 }
 
-static void unsignify(temp_real * a)
+static void
+unsignify(temp_real *a)
 {
 	if (!(a->a || a->b)) {
 		a->exponent = 0;
@@ -1164,7 +1166,7 @@ static void unsignify(temp_real * a)
 }
 
 static void
-fadd(const temp_real * src1, const temp_real * src2, temp_real * result)
+fadd(const temp_real *src1, const temp_real *src2, temp_real *result)
 {
 	temp_real a,b;
 	int x1,x2,shift;
@@ -1215,7 +1217,7 @@ fadd(const temp_real * src1, const temp_real * src2, temp_real * result)
 #define clear_Cx() (I387.swd &= ~0x4500)
 
 static void 
-normalize(temp_real * a)
+normalize(temp_real *a)
 {
 	int i = a->exponent & 0x7fff;
 	int sign = a->exponent & 0x8000;
@@ -1234,7 +1236,7 @@ normalize(temp_real * a)
 }
 
 static void
-ftst(const temp_real * a)
+ftst(const temp_real *a)
 {
 	temp_real b;
 
@@ -1249,7 +1251,7 @@ ftst(const temp_real * a)
 }
 
 static void
-fcom(const temp_real * src1, const temp_real * src2)
+fcom(const temp_real *src1, const temp_real *src2)
 {
 	temp_real a;
 
@@ -1260,7 +1262,7 @@ fcom(const temp_real * src1, const temp_real * src2)
 }
 
 static void
-fucom(const temp_real * src1, const temp_real * src2)
+fucom(const temp_real *src1, const temp_real *src2)
 {
 	fcom(src1,src2);
 }
@@ -1285,7 +1287,7 @@ fucom(const temp_real * src1, const temp_real * src2)
  */
 
 static void
-short_to_temp(const short_real * a, temp_real * b)
+short_to_temp(const short_real *a, temp_real *b)
 {
 	if (!(*a & 0x7fffffff)) {
 		b->a = b->b = 0;
@@ -1303,7 +1305,7 @@ short_to_temp(const short_real * a, temp_real * b)
 }
 
 static void
-long_to_temp(const long_real * a, temp_real * b)
+long_to_temp(const long_real *a, temp_real *b)
 {
 	if (!a->a && !(a->b & 0x7fffffff)) {
 		b->a = b->b = 0;
@@ -1321,7 +1323,7 @@ long_to_temp(const long_real * a, temp_real * b)
 }
 
 static void 
-temp_to_short(const temp_real * a, short_real * b)
+temp_to_short(const temp_real *a, short_real *b)
 {
 	if (!(a->exponent & 0x7fff)) {
 		*b = (a->exponent)?0x80000000UL:0;
@@ -1348,7 +1350,7 @@ temp_to_short(const temp_real * a, short_real * b)
 }
 
 static void
-temp_to_long(const temp_real * a, long_real * b)
+temp_to_long(const temp_real *a, long_real *b)
 {
 	if (!(a->exponent & 0x7fff)) {
 		b->a = 0;
@@ -1385,7 +1387,7 @@ temp_to_long(const temp_real * a, long_real * b)
 }
 
 static void 
-frndint(const temp_real * a, temp_real * b)
+frndint(const temp_real *a, temp_real *b)
 {
 	int shift =  16383 + 63 - (a->exponent & 0x7fff);
 	u_int32_t underflow;
@@ -1470,7 +1472,7 @@ Fscale(const temp_real *a, const temp_real *b, temp_real *c)
 }
 
 static void
-real_to_int(const temp_real * a, temp_int * b)
+real_to_int(const temp_real *a, temp_int *b)
 {
 	int shift =  16383 + 63 - (a->exponent & 0x7fff);
 	u_int32_t underflow;
@@ -1526,7 +1528,7 @@ real_to_int(const temp_real * a, temp_int * b)
 }
 
 static void
-int_to_real(const temp_int * a, temp_real * b)
+int_to_real(const temp_int *a, temp_real *b)
 {
 	b->a = a->a;
 	b->b = a->b;
diff --git a/sys/platform/pc32/i386/mem.c b/sys/platform/pc32/i386/mem.c
index c47b90c10b..c93df2a2c7 100644
--- a/sys/platform/pc32/i386/mem.c
+++ b/sys/platform/pc32/i386/mem.c
@@ -39,7 +39,7 @@
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/i386/i386/mem.c,v 1.79.2.9 2003/01/04 22:58:01 njl Exp $
- * $DragonFly: src/sys/platform/pc32/i386/Attic/mem.c,v 1.20 2006/09/10 01:26:39 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/Attic/mem.c,v 1.21 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -424,9 +424,7 @@ mem_ioctl(cdev_t dev, u_long cmd, caddr_t data, int flags, struct ucred *cred)
  * memory range attributes.
  */
 int
-mem_range_attr_get(mrd, arg)
-	struct mem_range_desc *mrd;
-	int *arg;
+mem_range_attr_get(struct mem_range_desc *mrd, int *arg)
 {
 	/* can we handle this? */
 	if (mem_range_softc.mr_op == NULL)
@@ -441,9 +439,7 @@ mem_range_attr_get(mrd, arg)
 }
 
 int
-mem_range_attr_set(mrd, arg)
-	struct mem_range_desc *mrd;
-	int *arg;
+mem_range_attr_set(struct mem_range_desc *mrd, int *arg)
 {
 	/* can we handle this? */
 	if (mem_range_softc.mr_op == NULL)
@@ -534,8 +530,7 @@ mmpoll(struct dev_poll_args *ap)
 }
 
 int
-iszerodev(dev)
-	cdev_t dev;
+iszerodev(cdev_t dev)
 {
 	return ((major(dev) == mem_ops.head.maj)
 	  && minor(dev) == 12);
diff --git a/sys/platform/pc32/i386/pmap.c b/sys/platform/pc32/i386/pmap.c
index 57ba4c02fa..8d791cb56f 100644
--- a/sys/platform/pc32/i386/pmap.c
+++ b/sys/platform/pc32/i386/pmap.c
@@ -40,7 +40,7 @@
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
  * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.250.2.18 2002/03/06 22:48:53 silby Exp $
- * $DragonFly: src/sys/platform/pc32/i386/pmap.c,v 1.56 2006/09/12 22:03:10 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/pmap.c,v 1.57 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -304,9 +304,7 @@ pmap_pte_quick(pmap_t pmap, vm_offset_t va)
  *	(physical) address starting relative to 0]
  */
 void
-pmap_bootstrap(firstaddr, loadaddr)
-	vm_paddr_t firstaddr;
-	vm_paddr_t loadaddr;
+pmap_bootstrap(vm_paddr_t firstaddr, vm_paddr_t loadaddr)
 {
 	vm_offset_t va;
 	pt_entry_t *pte;
@@ -544,7 +542,7 @@ pmap_init(void)
  * numbers of pv entries.
  */
 void
-pmap_init2()
+pmap_init2(void)
 {
 	int shpgperproc = PMAP_SHPGPERPROC;
 
diff --git a/sys/platform/pc32/i386/procfs_machdep.c b/sys/platform/pc32/i386/procfs_machdep.c
index 0937dec184..b86d367504 100644
--- a/sys/platform/pc32/i386/procfs_machdep.c
+++ b/sys/platform/pc32/i386/procfs_machdep.c
@@ -38,7 +38,7 @@
  *
  * From:
  * $FreeBSD: src/sys/i386/i386/procfs_machdep.c,v 1.14 1999/10/11 14:50:03 peter Exp $
- * $DragonFly: src/sys/platform/pc32/i386/procfs_machdep.c,v 1.5 2005/11/14 18:50:03 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/procfs_machdep.c,v 1.6 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -82,9 +82,7 @@
 #include <vm/vm_map.h>
 
 int
-procfs_read_regs(p, regs)
-	struct proc *p;
-	struct reg *regs;
+procfs_read_regs(struct proc *p, struct reg *regs)
 {
 	if (p->p_flag & P_SWAPPEDOUT)
 		return (EIO);
@@ -92,9 +90,7 @@ procfs_read_regs(p, regs)
 }
 
 int
-procfs_write_regs(p, regs)
-	struct proc *p;
-	struct reg *regs;
+procfs_write_regs(struct proc *p, struct reg *regs)
 {
 	if (p->p_flag & P_SWAPPEDOUT)
 		return (EIO);
@@ -102,9 +98,7 @@ procfs_write_regs(p, regs)
 }
 
 int
-procfs_read_dbregs(p, dbregs)
-	struct proc *p;
-	struct dbreg *dbregs;
+procfs_read_dbregs(struct proc *p, struct dbreg *dbregs)
 {
 	if (p->p_flag & P_SWAPPEDOUT)
 		return (EIO);
@@ -112,9 +106,7 @@ procfs_read_dbregs(p, dbregs)
 }
 
 int
-procfs_write_dbregs(p, dbregs)
-	struct proc *p;
-	struct dbreg *dbregs;
+procfs_write_dbregs(struct proc *p, struct dbreg *dbregs)
 {
 	if (p->p_flag & P_SWAPPEDOUT)
 		return (EIO);
@@ -127,9 +119,7 @@ procfs_write_dbregs(p, dbregs)
  */
 
 int
-procfs_read_fpregs(p, fpregs)
-	struct proc *p;
-	struct fpreg *fpregs;
+procfs_read_fpregs(struct proc *p, struct fpreg *fpregs)
 {
 	if (p->p_flag & P_SWAPPEDOUT)
 		return (EIO);
@@ -137,9 +127,7 @@ procfs_read_fpregs(p, fpregs)
 }
 
 int
-procfs_write_fpregs(p, fpregs)
-	struct proc *p;
-	struct fpreg *fpregs;
+procfs_write_fpregs(struct proc *p, struct fpreg *fpregs)
 {
 	if (p->p_flag & P_SWAPPEDOUT)
 		return (EIO);
@@ -147,8 +135,7 @@ procfs_write_fpregs(p, fpregs)
 }
 
 int
-procfs_sstep(p)
-	struct proc *p;
+procfs_sstep(struct proc *p)
 {
 	if (p->p_flag & P_SWAPPEDOUT)
 		return (EIO);
diff --git a/sys/platform/pc32/i386/trap.c b/sys/platform/pc32/i386/trap.c
index ae105a930c..4db15b7e31 100644
--- a/sys/platform/pc32/i386/trap.c
+++ b/sys/platform/pc32/i386/trap.c
@@ -36,7 +36,7 @@
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
  * $FreeBSD: src/sys/i386/i386/trap.c,v 1.147.2.11 2003/02/27 19:09:59 luoqi Exp $
- * $DragonFly: src/sys/platform/pc32/i386/trap.c,v 1.79 2006/09/03 18:29:16 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/trap.c,v 1.80 2006/09/13 18:45:12 swildner Exp $
  */
 
 /*
@@ -370,8 +370,7 @@ userexit(struct lwp *lp)
  */
 
 void
-trap(frame)
-	struct trapframe frame;
+trap(struct trapframe frame)
 {
 	struct globaldata *gd = mycpu;
 	struct thread *td = gd->gd_curthread;
@@ -878,10 +877,7 @@ out2:	;
  * to be made safe is the process tracing/debugging code.
  */
 static int
-trap_pfault(frame, usermode, eva)
-	struct trapframe *frame;
-	int usermode;
-	vm_offset_t eva;
+trap_pfault(struct trapframe *frame, int usermode, vm_offset_t eva)
 {
 	vm_offset_t va;
 	struct vmspace *vm = NULL;
@@ -983,10 +979,7 @@ nogo:
 #endif
 
 int
-trap_pfault(frame, usermode, eva)
-	struct trapframe *frame;
-	int usermode;
-	vm_offset_t eva;
+trap_pfault(struct trapframe *frame, int usermode, vm_offset_t eva)
 {
 	vm_offset_t va;
 	struct vmspace *vm = NULL;
@@ -1091,9 +1084,7 @@ nogo:
 }
 
 static void
-trap_fatal(frame, eva)
-	struct trapframe *frame;
-	vm_offset_t eva;
+trap_fatal(struct trapframe *frame, vm_offset_t eva)
 {
 	int code, type, ss, esp;
 	struct soft_segment_descriptor softseg;
@@ -1198,7 +1189,7 @@ trap_fatal(frame, eva)
  * of this is that "trace <ebp>" in ddb won't work.
  */
 void
-dblfault_handler()
+dblfault_handler(void)
 {
 	struct mdglobaldata *gd = mdcpu;
 
@@ -1221,8 +1212,8 @@ dblfault_handler()
  * it the page tables have already been faulted in and high addresses
  * are thrown out early for other reasons.
  */
-int trapwrite(addr)
-	unsigned addr;
+int
+trapwrite(unsigned addr)
 {
 	struct proc *p;
 	vm_offset_t va;
@@ -1489,9 +1480,7 @@ bad:
  * trampoline code which then runs doreti.
  */
 void
-fork_return(p, frame)
-	struct proc *p;
-	struct trapframe frame;
+fork_return(struct proc *p, struct trapframe frame)
 {
 	struct lwp *lp;
 
diff --git a/sys/platform/pc32/i386/userconfig.c b/sys/platform/pc32/i386/userconfig.c
index 8f673fd31e..ff55b15e82 100644
--- a/sys/platform/pc32/i386/userconfig.c
+++ b/sys/platform/pc32/i386/userconfig.c
@@ -47,7 +47,7 @@
  ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  **
  ** $FreeBSD: src/sys/i386/i386/userconfig.c,v 1.175.2.10 2002/10/05 18:31:48 scottl Exp $
- ** $DragonFly: src/sys/platform/pc32/i386/userconfig.c,v 1.7 2006/09/05 00:55:45 dillon Exp $
+ ** $DragonFly: src/sys/platform/pc32/i386/userconfig.c,v 1.8 2006/09/13 18:45:12 swildner Exp $
  **/
 
 /**
@@ -3117,7 +3117,7 @@ introfunc(CmdParm *parms)
 
 #if NPNP > 0
 static int
-lspnp ()
+lspnp(void)
 {
     struct pnp_cinfo *c;
     int i, first = 1;
@@ -3409,8 +3409,7 @@ save_resource(struct uc_device *idev)
 }
 
 static int
-save_dev(idev)
-struct uc_device 	*idev;
+save_dev(struct uc_device *idev)
 {
 	struct uc_device	*id_p,*id_pn;
 	char *name = idev->id_name;
diff --git a/sys/platform/pc32/i386/vm86.c b/sys/platform/pc32/i386/vm86.c
index eec3099600..2f873d7616 100644
--- a/sys/platform/pc32/i386/vm86.c
+++ b/sys/platform/pc32/i386/vm86.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/i386/vm86.c,v 1.31.2.2 2001/10/05 06:18:55 peter Exp $
- * $DragonFly: src/sys/platform/pc32/i386/vm86.c,v 1.19 2006/09/05 00:55:45 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/vm86.c,v 1.20 2006/09/13 18:45:12 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -169,8 +169,7 @@ POPL(struct vm86frame *vmf)
  * MPSAFE
  */
 int
-vm86_emulate(vmf)
-	struct vm86frame *vmf;
+vm86_emulate(struct vm86frame *vmf)
 {
 	struct vm86_kernel *vm86;
 	caddr_t addr;
@@ -656,10 +655,7 @@ vm86_intcall(int intnum, struct vm86frame *vmf)
  * caller's cs:ip routine.  
  */
 int
-vm86_datacall(intnum, vmf, vmc)
-	int intnum;
-	struct vm86frame *vmf;
-	struct vm86context *vmc;
+vm86_datacall(int intnum, struct vm86frame *vmf, struct vm86context *vmc)
 {
 	pt_entry_t *pte = vm86paddr;
 	u_int page;
@@ -687,10 +683,7 @@ vm86_datacall(intnum, vmf, vmc)
 }
 
 vm_offset_t
-vm86_getaddr(vmc, sel, off)
-	struct vm86context *vmc;
-	u_short sel;
-	u_short off;
+vm86_getaddr(struct vm86context *vmc, u_short sel, u_short off)
 {
 	int i, page;
 	vm_offset_t addr;
@@ -704,11 +697,8 @@ vm86_getaddr(vmc, sel, off)
 }
 
 int
-vm86_getptr(vmc, kva, sel, off)
-	struct vm86context *vmc;
-	vm_offset_t kva;
-	u_short *sel;
-	u_short *off;
+vm86_getptr(struct vm86context *vmc, vm_offset_t kva, u_short *sel,
+	    u_short *off)
 {
 	int i;
 
diff --git a/sys/platform/pc32/i386/vm_machdep.c b/sys/platform/pc32/i386/vm_machdep.c
index 0aa2eb3cba..6105c0012c 100644
--- a/sys/platform/pc32/i386/vm_machdep.c
+++ b/sys/platform/pc32/i386/vm_machdep.c
@@ -39,7 +39,7 @@
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
  * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.132.2.9 2003/01/25 19:02:23 dillon Exp $
- * $DragonFly: src/sys/platform/pc32/i386/vm_machdep.c,v 1.44 2006/09/05 00:55:45 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/vm_machdep.c,v 1.45 2006/09/13 18:45:12 swildner Exp $
  */
 
 #include "use_npx.h"
@@ -96,9 +96,7 @@ extern int	_ucodesel, _udatasel;
  * ready to run and return to user mode.
  */
 void
-cpu_fork(p1, p2, flags)
-	struct proc *p1, *p2;
-	int flags;
+cpu_fork(struct proc *p1, struct proc *p2, int flags)
 {
 	struct pcb *pcb2;
 
@@ -216,10 +214,7 @@ cpu_fork(p1, p2, flags)
  * This is needed to make kernel threads stay in kernel mode.
  */
 void
-cpu_set_fork_handler(p, func, arg)
-	struct proc *p;
-	void (*func) (void *);
-	void *arg;
+cpu_set_fork_handler(struct proc *p, void (*func)(void *), void *arg)
 {
 	/*
 	 * Note that the trap frame follows the args, so the function
@@ -346,9 +341,7 @@ cpu_coredump(struct thread *td, struct vnode *vp, struct ucred *cred)
 
 #ifdef notyet
 static void
-setredzone(pte, vaddr)
-	u_short *pte;
-	caddr_t vaddr;
+setredzone(u_short *pte, caddr_t vaddr)
 {
 /* eventually do this by setting up an expand-down stack segment
    for ss0: selector, allowing stack access down to top of u.
@@ -381,7 +374,7 @@ kvtop(void *addr)
 
 #ifdef SMP
 static void
-cpu_reset_proxy()
+cpu_reset_proxy(void)
 {
 	u_int saved_mp_lock;
 
@@ -402,7 +395,7 @@ cpu_reset_proxy()
 #endif
 
 void
-cpu_reset()
+cpu_reset(void)
 {
 #ifdef SMP
 	if (smp_active_mask == 1) {
@@ -458,7 +451,7 @@ cpu_reset()
 }
 
 static void
-cpu_reset_real()
+cpu_reset_real(void)
 {
 	/*
 	 * Attempt to do a CPU reset via the keyboard controller,
@@ -482,9 +475,7 @@ cpu_reset_real()
 }
 
 int
-grow_stack(p, sp)
-	struct proc *p;
-	u_int sp;
+grow_stack(struct proc *p, u_int sp)
 {
 	int rv;
 
@@ -511,7 +502,7 @@ SYSCTL_INT(_vm_stats_misc, OID_AUTO,
 #define ZIDLE_HI(v)	((v) * 4 / 5)
 
 int
-vm_page_zero_idle()
+vm_page_zero_idle(void)
 {
 	static int free_rover;
 	static int zero_state;
@@ -598,8 +589,7 @@ SYSINIT(vm_setup, SI_SUB_CPU, SI_ORDER_ANY, swi_vm_setup, NULL);
  */
 
 int
-is_physical_memory(addr)
-	vm_offset_t addr;
+is_physical_memory(vm_offset_t addr)
 {
 
 #if NISA > 0
diff --git a/sys/platform/pc32/isa/ipl_funcs.c b/sys/platform/pc32/isa/ipl_funcs.c
index 1913c2d87e..c44ab9f67f 100644
--- a/sys/platform/pc32/isa/ipl_funcs.c
+++ b/sys/platform/pc32/isa/ipl_funcs.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/ipl_funcs.c,v 1.32.2.5 2002/12/17 18:04:02 sam Exp $
- * $DragonFly: src/sys/platform/pc32/isa/ipl_funcs.c,v 1.11 2005/11/02 22:59:47 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/isa/ipl_funcs.c,v 1.12 2006/09/13 18:45:12 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -45,7 +45,8 @@
  * Note: setbits uses a locked or, making simple cases MP safe.
  */
 #define DO_SETBITS(name, var, bits) 					\
-void name(void)								\
+void									\
+name(void)								\
 {									\
 	struct mdglobaldata *gd = mdcpu;				\
 	atomic_set_int_nonlocked(var, bits);				\
diff --git a/sys/platform/pc32/isa/prof_machdep.c b/sys/platform/pc32/isa/prof_machdep.c
index 269f27b84e..c251749056 100644
--- a/sys/platform/pc32/isa/prof_machdep.c
+++ b/sys/platform/pc32/isa/prof_machdep.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/prof_machdep.c,v 1.14.2.1 2000/08/03 00:09:30 ps Exp $
- * $DragonFly: src/sys/platform/pc32/isa/prof_machdep.c,v 1.5 2005/02/27 12:44:43 asmodai Exp $
+ * $DragonFly: src/sys/platform/pc32/isa/prof_machdep.c,v 1.6 2006/09/13 18:45:12 swildner Exp $
  */
 
 #ifdef GUPROF
@@ -180,7 +180,7 @@ GMON_PROF_HIRES	=	4					\n\
  * dependent.
  */
 int
-cputime()
+cputime(void)
 {
 	u_int count;
 	int delta;
@@ -290,8 +290,7 @@ SYSCTL_PROC(_machdep, OID_AUTO, cputime_clock, CTLTYPE_INT | CTLFLAG_RW,
  */
 
 void
-startguprof(gp)
-	struct gmonparam *gp;
+startguprof(struct gmonparam *gp)
 {
 	if (cputime_clock == CPUTIME_CLOCK_UNINITIALIZED) {
 		cputime_clock = CPUTIME_CLOCK_I8254;
@@ -336,8 +335,7 @@ startguprof(gp)
 }
 
 void
-stopguprof(gp)
-	struct gmonparam *gp;
+stopguprof(struct gmonparam *gp)
 {
 #if defined(PERFMON) && defined(I586_PMC_GUPROF)
 	if (cputime_clock_pmc_init) {
-- 
2.41.0