kill trainling spaces

32 files changed, 154 insertions, 154 deletions

diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c
index 5e8e6637435..5e4e7041431 100644
--- a/sys/arch/i386/i386/apm.c
+++ b/sys/arch/i386/i386/apm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apm.c,v 1.68 2006/04/15 20:43:36 mickey Exp $	*/
+/*	$OpenBSD: apm.c,v 1.69 2006/05/11 13:21:11 mickey Exp $	*/
 
 /*-
  * Copyright (c) 1998-2001 Michael Shalayeff. All rights reserved.
@@ -663,8 +663,8 @@ apm_cpu_idle(void)
 		return;
 	}
 		
-	/* 
-	 * We call the bios APM_IDLE routine here only when we 
+	/*
+	 * We call the bios APM_IDLE routine here only when we
 	 * have been idle for some time - otherwise we just hlt.
 	 */
 
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index 6d872952748..a4421ea1467 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.58 2006/04/27 15:37:50 mickey Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.59 2006/05/11 13:21:11 mickey Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 /*
  * Setup the system to run on the current machine.
  *
- * cpu_configure() is called at boot time and initializes the vba 
+ * cpu_configure() is called at boot time and initializes the vba
  * device tables and the memory controller monitoring.  Available
  * devices are determined (from possibilities mentioned in ioconf.c),
  * and the drivers are initialized.
diff --git a/sys/arch/i386/i386/cpu.c b/sys/arch/i386/i386/cpu.c
index 4d86a3af627..d039b471381 100644
--- a/sys/arch/i386/i386/cpu.c
+++ b/sys/arch/i386/i386/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.18 2006/04/27 15:37:50 mickey Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.19 2006/05/11 13:21:11 mickey Exp $	*/
 /* $NetBSD: cpu.c,v 1.1.2.7 2000/06/26 02:04:05 sommerfeld Exp $ */
 
 /*-
@@ -114,7 +114,7 @@ int     cpu_match(struct device *, void *, void *);
 void    cpu_attach(struct device *, struct device *, void *);
 
 #ifdef MULTIPROCESSOR
-int mp_cpu_start(struct cpu_info *); 
+int mp_cpu_start(struct cpu_info *);
 void mp_cpu_start_cleanup(struct cpu_info *);
 struct cpu_functions mp_cpu_funcs =
     { mp_cpu_start, NULL, mp_cpu_start_cleanup };
diff --git a/sys/arch/i386/i386/db_disasm.c b/sys/arch/i386/i386/db_disasm.c
index c3c6ea89633..2b59e7ff249 100644
--- a/sys/arch/i386/i386/db_disasm.c
+++ b/sys/arch/i386/i386/db_disasm.c
@@ -1,28 +1,28 @@
-/*	$OpenBSD: db_disasm.c,v 1.12 2004/06/23 00:08:50 andreas Exp $	*/
+/*	$OpenBSD: db_disasm.c,v 1.13 2006/05/11 13:21:11 mickey Exp $	*/
 /*	$NetBSD: db_disasm.c,v 1.11 1996/05/03 19:41:58 christos Exp $	*/
 
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
diff --git a/sys/arch/i386/i386/db_interface.c b/sys/arch/i386/i386/db_interface.c
index b20b9bd4d7e..3662dc593b5 100644
--- a/sys/arch/i386/i386/db_interface.c
+++ b/sys/arch/i386/i386/db_interface.c
@@ -1,28 +1,28 @@
-/*	$OpenBSD: db_interface.c,v 1.19 2006/03/08 21:04:57 marco Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.20 2006/05/11 13:21:11 mickey Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.22 1996/05/03 19:42:00 christos Exp $	*/
 
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
diff --git a/sys/arch/i386/i386/db_memrw.c b/sys/arch/i386/i386/db_memrw.c
index e4bf0447b5a..f490f1e02e1 100644
--- a/sys/arch/i386/i386/db_memrw.c
+++ b/sys/arch/i386/i386/db_memrw.c
@@ -1,28 +1,28 @@
-/*	$OpenBSD: db_memrw.c,v 1.10 2006/05/10 13:45:37 mickey Exp $	*/
+/*	$OpenBSD: db_memrw.c,v 1.11 2006/05/11 13:21:11 mickey Exp $	*/
 /*	$NetBSD: db_memrw.c,v 1.6 1999/04/12 20:38:19 pk Exp $	*/
 
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
diff --git a/sys/arch/i386/i386/db_trace.c b/sys/arch/i386/i386/db_trace.c
index a552cc883e9..cadf68728f3 100644
--- a/sys/arch/i386/i386/db_trace.c
+++ b/sys/arch/i386/i386/db_trace.c
@@ -1,28 +1,28 @@
-/*	$OpenBSD: db_trace.c,v 1.10 2004/07/02 16:29:55 niklas Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.11 2006/05/11 13:21:11 mickey Exp $	*/
 /*	$NetBSD: db_trace.c,v 1.18 1996/05/03 19:42:01 christos Exp $	*/
 
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -129,13 +129,13 @@ db_numargs(fp)
 	return (args);
 }
 
-/* 
- * Figure out the next frame up in the call stack.  
- * For trap(), we print the address of the faulting instruction and 
+/*
+ * Figure out the next frame up in the call stack.
+ * For trap(), we print the address of the faulting instruction and
  *   proceed with the calling frame.  We return the ip that faulted.
  *   If the trap was caused by jumping through a bogus pointer, then
- *   the next line in the backtrace will list some random function as 
- *   being called.  It should get the argument list correct, though.  
+ *   the next line in the backtrace will list some random function as
+ *   being called.  It should get the argument list correct, though.
  *   It might be possible to dig out from the next frame up the name
  *   of the function that faulted, but that could get hairy.
  */
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c
index 8f324448c54..8f6309f0360 100644
--- a/sys/arch/i386/i386/disksubr.c
+++ b/sys/arch/i386/i386/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.49 2006/03/15 20:20:39 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.50 2006/05/11 13:21:11 mickey Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -121,7 +121,7 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 			bp->b_flags = B_BUSY | B_READ;
 			bp->b_cylinder = part_blkno / lp->d_secpercyl;
 			(*strat)(bp);
-		     
+
 			/* if successful, wander through dos partition table */
 			if (biowait(bp)) {
 				msg = "dos partition I/O error";
diff --git a/sys/arch/i386/i386/dkcsum.c b/sys/arch/i386/i386/dkcsum.c
index 05141b557db..19af1e527b8 100644
--- a/sys/arch/i386/i386/dkcsum.c
+++ b/sys/arch/i386/i386/dkcsum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dkcsum.c,v 1.20 2006/01/22 00:40:01 miod Exp $	*/
+/*	$OpenBSD: dkcsum.c,v 1.21 2006/05/11 13:21:11 mickey Exp $	*/
 
 /*-
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -173,7 +173,7 @@ dkcsumattach(void)
 		 * out in the bootblocks.
 		 */
 
-		/* B_TYPE dependent hd unit counting bootblocks */ 
+		/* B_TYPE dependent hd unit counting bootblocks */
 		if ((B_TYPE(bootdev) == B_TYPE(hit->bsd_dev)) &&
 		    (B_UNIT(bootdev) == B_UNIT(hit->bsd_dev))) {
 			int type, ctrl, adap, part, unit;
diff --git a/sys/arch/i386/i386/esm.c b/sys/arch/i386/i386/esm.c
index 259dcb3d338..ca5fc2971ea 100644
--- a/sys/arch/i386/i386/esm.c
+++ b/sys/arch/i386/i386/esm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: esm.c,v 1.41 2006/04/21 09:33:10 dlg Exp $ */
+/*	$OpenBSD: esm.c,v 1.42 2006/05/11 13:21:11 mickey Exp $ */
 
 /*
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -804,7 +804,7 @@ esm_devmap(struct esm_softc *sc, struct esm_devmap *devmap)
 	}
 
 	printf("%s: %s%s%s %d.%d\n", DEVNAME(sc),
-	    name ? name : "", name ? " " : "", fname, 
+	    name ? name : "", name ? " " : "", fname,
 	    devmap->rev_major, devmap->rev_minor);
 
 	esm_make_sensors(sc, devmap, sensor_map, mapsize);
diff --git a/sys/arch/i386/i386/est.c b/sys/arch/i386/i386/est.c
index ac90b763cd5..b84cfb0b427 100644
--- a/sys/arch/i386/i386/est.c
+++ b/sys/arch/i386/i386/est.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: est.c,v 1.13 2006/02/27 14:13:10 marco Exp $ */
+/*	$OpenBSD: est.c,v 1.14 2006/05/11 13:21:11 mickey Exp $ */
 /*
  * Copyright (c) 2003 Michael Eriksson.
  * All rights reserved.
@@ -32,7 +32,7 @@
  * Pentium M processors.
  *
  * Reference documentation:
- *   
+ *
  * - IA-32 Intel Architecture Software Developer's Manual, Volume 3:
  *   System Programming Guide.
  *   Section 13.14, Enhanced Intel SpeedStep technology.
@@ -51,7 +51,7 @@
  *   Encoding of MSR_PERF_CTL and MSR_PERF_STATUS.
  *   http://www.codemonkey.org.uk/projects/cpufreq/cpufreq-2.4.22-pre6-1.gz
  */
- 
+
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -154,7 +154,7 @@ static const struct fq_info pentium_m_n723[] = {
 	{ 1000,  940 },
 	{  900,  908 },
 	{  800,  876 },
-	{  600,  812 } 
+	{  600,  812 }
 };
 
 /* Intel Pentium M processor 733 1.1 GHz */
@@ -287,7 +287,7 @@ static const struct fq_info pentium_m_n765[] = {
 	{ 1200, 1132 },
 	{ 1000, 1084 },
 	{  800, 1036 },
-	{  600,  988 } 
+	{  600,  988 }
 };
 
 /* Intel Pentium M processor 770 2.13 GHz */
diff --git a/sys/arch/i386/i386/freebsd_machdep.c b/sys/arch/i386/i386/freebsd_machdep.c
index 9e213ce906a..21d561fc8e9 100644
--- a/sys/arch/i386/i386/freebsd_machdep.c
+++ b/sys/arch/i386/i386/freebsd_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: freebsd_machdep.c,v 1.18 2006/01/12 22:39:20 weingart Exp $	*/
+/*	$OpenBSD: freebsd_machdep.c,v 1.19 2006/05/11 13:21:11 mickey Exp $	*/
 /*	$NetBSD: freebsd_machdep.c,v 1.10 1996/05/03 19:42:05 christos Exp $	*/
 
 /*-
@@ -86,7 +86,7 @@ freebsd_sendsig(catcher, sig, mask, code, type, val)
 	struct sigacts *psp = p->p_sigacts;
 	int oonstack;
 
-	/* 
+	/*
 	 * Build the argument list for the signal handler.
 	 */
 	frame.sf_signum = sig;
@@ -279,7 +279,7 @@ netbsd_to_freebsd_ptrace_regs(nregs, nfpregs, fregs)
 		*(struct freebsd_env87 *)&nframe->sv_env;
 	bcopy(nframe->sv_ac, fregs->freebsd_ptrace_fpregs.sv_ac,
 	      sizeof(fregs->freebsd_ptrace_fpregs.sv_ac));
-	fregs->freebsd_ptrace_fpregs.sv_ex_sw = 
+	fregs->freebsd_ptrace_fpregs.sv_ex_sw =
 		nframe->sv_ex_sw;
 #if 0
 	/*
@@ -363,13 +363,13 @@ freebsd_ptrace_getregs(struct freebsd_ptrace_reg *fregs, caddr_t addr,
 		*datap = FREEBSD_REGS_OFFSET + FREEBSD_USRSTACK;
 		return 0;
 	} else if (offset >= FREEBSD_REGS_OFFSET &&
-		   offset <= FREEBSD_REGS_OFFSET + 
+		   offset <= FREEBSD_REGS_OFFSET +
 		      sizeof(fregs->freebsd_ptrace_regs)-sizeof(register_t)) {
 		*datap = *(register_t *)&((caddr_t)&fregs->freebsd_ptrace_regs)
 			[(vaddr_t) addr - FREEBSD_REGS_OFFSET];
 		return 0;
 	} else if (offset >= FREEBSD_U_SAVEFP_OFFSET &&
-		   offset <= FREEBSD_U_SAVEFP_OFFSET + 
+		   offset <= FREEBSD_U_SAVEFP_OFFSET +
 		      sizeof(fregs->freebsd_ptrace_fpregs)-sizeof(register_t)){
 		*datap= *(register_t *)&((caddr_t)&fregs->freebsd_ptrace_fpregs)
 			[offset - FREEBSD_U_SAVEFP_OFFSET];
@@ -396,7 +396,7 @@ freebsd_ptrace_setregs(fregs, addr, data)
 			[offset - FREEBSD_REGS_OFFSET] = data;
 		return 0;
 	} else if (offset >= FREEBSD_U_SAVEFP_OFFSET &&
-		   offset <= FREEBSD_U_SAVEFP_OFFSET + 
+		   offset <= FREEBSD_U_SAVEFP_OFFSET +
 			sizeof(fregs->freebsd_ptrace_fpregs) - sizeof(int)) {
 		*(int *)&((caddr_t)&fregs->freebsd_ptrace_fpregs)
 			[offset - FREEBSD_U_SAVEFP_OFFSET] = data;
diff --git a/sys/arch/i386/i386/i686_mem.c b/sys/arch/i386/i386/i686_mem.c
index 792a14ed6bf..3123f63e3ad 100644
--- a/sys/arch/i386/i386/i686_mem.c
+++ b/sys/arch/i386/i386/i686_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i686_mem.c,v 1.6 2003/05/04 04:29:03 tedu Exp $ */
+/* $OpenBSD: i686_mem.c,v 1.7 2006/05/11 13:21:11 mickey Exp $ */
 /*-
  * Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
  * All rights reserved.
@@ -107,7 +107,7 @@ int i686_mtrrtomrt[] = {
 #define MTRRTOMRTLEN (sizeof(i686_mtrrtomrt) / sizeof(i686_mtrrtomrt[0]))
 
 int
-i686_mtrr2mrt(int val) 
+i686_mtrr2mrt(int val)
 {
 	if (val < 0 || val >= MTRRTOMRTLEN)
 		return MDF_UNKNOWN;
@@ -118,7 +118,7 @@ i686_mtrr2mrt(int val)
  * i686 MTRR conflicts. Writeback and uncachable may overlap.
  */
 int
-i686_mtrrconflict(int flag1, int flag2) 
+i686_mtrrconflict(int flag1, int flag2)
 {
 
 	flag1 &= MDF_ATTRMASK;
@@ -214,7 +214,7 @@ i686_mrfetch(sc)
 			i686_mtrr2mrt(msrv & 0xff);
 		mrd->mr_base = msrv & 0x0000000ffffff000LL;
 		msrv = rdmsr(msr + 1);
-		mrd->mr_flags = (msrv & 0x800) ? 
+		mrd->mr_flags = (msrv & 0x800) ?
 			(mrd->mr_flags | MDF_ACTIVE) :
 			(mrd->mr_flags & ~MDF_ACTIVE);
 		/* Compute the range from the mask. Ick. */
@@ -305,7 +305,7 @@ i686_mrstoreone(arg)
 			omsrv = rdmsr(msr);
 			for (j = 7; j >= 0; j--) {
 				msrv = msrv << 8;
-				msrv |= i686_mrt2mtrr((mrd + j)->mr_flags, 
+				msrv |= i686_mrt2mtrr((mrd + j)->mr_flags,
 						      omsrv >> (j*8));
 			}
 			wrmsr(msr, msrv);
@@ -385,7 +385,7 @@ i686_mtrrfixsearch(sc, addr)
  * Try to satisfy the given range request by manipulating the fixed MTRRs that
  * cover low memory.
  *
- * Note that we try to be generous here; we'll bloat the range out to the 
+ * Note that we try to be generous here; we'll bloat the range out to the
  * next higher/lower boundary to avoid the consumer having to know too much
  * about the mechanisms here.
  *
@@ -394,7 +394,7 @@ i686_mtrrfixsearch(sc, addr)
 int
 i686_mrsetlow(sc, mrd, arg)
 	struct mem_range_softc 	*sc;
-	struct mem_range_desc 	*mrd; 
+	struct mem_range_desc 	*mrd;
 	int 			*arg;
 {
 	struct mem_range_desc	*first_md, *last_md, *curr_md;
@@ -434,9 +434,9 @@ i686_mrsetvariable(sc, mrd, arg)
 {
 	struct mem_range_desc	*curr_md, *free_md;
 	int			 i;
-    
-	/* 
-	 * Scan the currently active variable descriptors, look for 
+
+	/*
+	 * Scan the currently active variable descriptors, look for
 	 * one we exactly match (straight takeover) and for possible
 	 * accidental overlaps.
 	 * Keep track of the first empty variable descriptor in case we
@@ -455,7 +455,7 @@ i686_mrsetvariable(sc, mrd, arg)
 					return(EBUSY);
 				/* check we aren't doing something risky */
 				if (!(mrd->mr_flags & MDF_FORCE) &&
-				    ((curr_md->mr_flags & MDF_ATTRMASK) 
+				    ((curr_md->mr_flags & MDF_ATTRMASK)
 				    == MDF_UNKNOWN))
 					return (EACCES);
 				/* Ok, just hijack this entry */
@@ -465,7 +465,7 @@ i686_mrsetvariable(sc, mrd, arg)
 			/* non-exact overlap ? */
 			if (mroverlap(curr_md, mrd)) {
 				/* between conflicting region types? */
-				if (i686_mtrrconflict(curr_md->mr_flags, 
+				if (i686_mtrrconflict(curr_md->mr_flags,
 						      mrd->mr_flags))
 					return(EINVAL);
 			}
@@ -541,7 +541,7 @@ i686_mrset(sc, mrd, arg)
 }
 
 /*
- * Work out how many ranges we support, initialise storage for them, 
+ * Work out how many ranges we support, initialise storage for them,
  * fetch the initial settings.
  */
 void
@@ -569,8 +569,8 @@ i686_mrinit(sc)
 		nmdesc += MTRR_N64K + MTRR_N16K + MTRR_N4K;
 	}
 	
-	sc->mr_desc = 
-		(struct mem_range_desc *)malloc(nmdesc * sizeof(struct mem_range_desc), 
+	sc->mr_desc =
+		(struct mem_range_desc *)malloc(nmdesc * sizeof(struct mem_range_desc),
 						M_MEMDESC, M_WAITOK);
 	bzero(sc->mr_desc, nmdesc * sizeof(struct mem_range_desc));
 	sc->mr_ndesc = nmdesc;
@@ -596,8 +596,8 @@ i686_mrinit(sc)
 		}
 	}
 	
-	/* 
-	 * Get current settings, anything set now is considered to have 
+	/*
+	 * Get current settings, anything set now is considered to have
 	 * been set by the firmware. (XXX has something already played here?)
 	 */
 	i686_mrfetch(sc);
diff --git a/sys/arch/i386/i386/ioapic.c b/sys/arch/i386/i386/ioapic.c
index 7a7620f4932..1cdb463ebaf 100644
--- a/sys/arch/i386/i386/ioapic.c
+++ b/sys/arch/i386/i386/ioapic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioapic.c,v 1.9 2006/05/09 18:41:22 kettenis Exp $	*/
+/*	$OpenBSD: ioapic.c,v 1.10 2006/05/11 13:21:11 mickey Exp $	*/
 /* 	$NetBSD: ioapic.c,v 1.7 2003/07/14 22:32:40 lukem Exp $	*/
 
 /*-
@@ -128,7 +128,7 @@ u_int16_t ioapic_id_map = (1 << IOAPIC_ID_MAX) - 1;
  * When we renumber I/O APICs we provide a mapping vector giving us the new
  * ID out of the old BIOS supplied one.  Each item must be able to hold IDs
  * in [0, IOAPIC_ID_MAX << 1), since we use an extra bit to tell if the ID
- * has actually been remapped.  
+ * has actually been remapped.
  */
 u_int8_t ioapic_id_remap[IOAPIC_ID_MAX];
 
@@ -422,8 +422,8 @@ apic_set_redir(struct ioapic_softc *sc, int pin)
 		 * XXX will want to distribute interrupts across cpu's
 		 * eventually.  most likely, we'll want to vector each
 		 * interrupt to a specific CPU and load-balance across
-		 * cpu's.  but there's no point in doing that until after 
-		 * most interrupts run without the kernel lock.  
+		 * cpu's.  but there's no point in doing that until after
+		 * most interrupts run without the kernel lock.
 		 */
 		redhi |= (ioapic_bsp_id << IOAPIC_REDHI_DEST_SHIFT);
 
@@ -510,7 +510,7 @@ apic_vectorset(struct ioapic_softc *sc, int pin, int minlevel, int maxlevel)
 			    sc->sc_dev.dv_xname, pin, maxlevel);
 		}
 		apic_maxlevel[nvector] = maxlevel;
-		/* 
+		/*
 		 * XXX want special handler for the maxlevel != minlevel
 		 * case here!
 		 */
diff --git a/sys/arch/i386/i386/ipifuncs.c b/sys/arch/i386/i386/ipifuncs.c
index 4428f6f2ff1..8d03a5f8707 100644
--- a/sys/arch/i386/i386/ipifuncs.c
+++ b/sys/arch/i386/i386/ipifuncs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipifuncs.c,v 1.4 2006/03/10 21:09:22 mickey Exp $	*/
+/*	$OpenBSD: ipifuncs.c,v 1.5 2006/05/11 13:21:11 mickey Exp $	*/
 /* $NetBSD: ipifuncs.c,v 1.1.2.3 2000/06/26 02:04:06 sommerfeld Exp $ */
 
 /*-
@@ -71,7 +71,7 @@ void i386_ipi_flush_fpu(struct cpu_info *);
 #define i386_ipi_flush_fpu 0
 #endif
 
-void (*ipifunc[I386_NIPI])(struct cpu_info *) = 
+void (*ipifunc[I386_NIPI])(struct cpu_info *) =
 {
 	i386_ipi_halt,
 #if 0 && (defined(I586_CPU) || defined(I686_CPU))
diff --git a/sys/arch/i386/i386/ipx_cksum.c b/sys/arch/i386/i386/ipx_cksum.c
index 981da5ff6df..26bd1993705 100644
--- a/sys/arch/i386/i386/ipx_cksum.c
+++ b/sys/arch/i386/i386/ipx_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipx_cksum.c,v 1.3 2003/06/02 23:27:47 millert Exp $	*/
+/*	$OpenBSD: ipx_cksum.c,v 1.4 2006/05/11 13:21:11 mickey Exp $	*/
 
 /*-
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -44,7 +44,7 @@
  *
  * This routine is very heavily used in the network
  * code and should be modified for each CPU to be as fast as possible.
- * 
+ *
  * This implementation is 386 version.
  */
 
diff --git a/sys/arch/i386/i386/k6_mem.c b/sys/arch/i386/i386/k6_mem.c
index 9266bd30308..bfe1dc82b49 100644
--- a/sys/arch/i386/i386/k6_mem.c
+++ b/sys/arch/i386/i386/k6_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: k6_mem.c,v 1.5 2002/03/14 01:26:32 millert Exp $ */
+/* $OpenBSD: k6_mem.c,v 1.6 2006/05/11 13:21:11 mickey Exp $ */
 /*-
  * Copyright (c) 1999 Brian Fundakowski Feldman
  * All rights reserved.
@@ -78,7 +78,7 @@ struct mem_range_ops k6_mrops = {
 };
 
 __inline int
-k6_mrmake(desc, mtrr) 
+k6_mrmake(desc, mtrr)
 	struct mem_range_desc 	*desc;
 	u_int32_t 		*mtrr;
 {
@@ -93,7 +93,7 @@ k6_mrmake(desc, mtrr)
 		return EOPNOTSUPP;
 
 	for (bit = ffs(desc->mr_len >> 17) - 1; bit < 15; bit++)
-		len |= 1 << bit; 
+		len |= 1 << bit;
 	wc = (desc->mr_flags & MDF_WRITECOMBINE) ? 1 : 0;
 	uc = (desc->mr_flags & MDF_UNCACHEABLE) ? 1 : 0;
 
@@ -102,7 +102,7 @@ k6_mrmake(desc, mtrr)
 }
 
 void
-k6_mrinit(sc) 
+k6_mrinit(sc)
 	struct mem_range_softc *sc;
 {
 	u_int64_t reg;
@@ -135,7 +135,7 @@ k6_mrinit(sc)
 }
 
 int
-k6_mrset(sc, desc, arg) 
+k6_mrset(sc, desc, arg)
 	struct mem_range_softc 	*sc;
 	struct mem_range_desc 	*desc;
 	int 			*arg;
diff --git a/sys/arch/i386/i386/kgdb_machdep.c b/sys/arch/i386/i386/kgdb_machdep.c
index 2520d07fd93..95623ff532a 100644
--- a/sys/arch/i386/i386/kgdb_machdep.c
+++ b/sys/arch/i386/i386/kgdb_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kgdb_machdep.c,v 1.5 2006/04/27 15:37:51 mickey Exp $	*/
+/*	$OpenBSD: kgdb_machdep.c,v 1.6 2006/05/11 13:21:11 mickey Exp $	*/
 /*	$NetBSD: kgdb_machdep.c,v 1.6 1998/08/13 21:36:03 thorpej Exp $	*/
 
 /*-
@@ -115,7 +115,7 @@ kgdb_acc(va, len)
  * Translate a trap number into a unix compatible signal value.
  * (gdb only understands unix signal numbers).
  */
-int 
+int
 kgdb_signal(type)
 	int type;
 {
diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s
index 129a2526f59..c2755201e65 100644
--- a/sys/arch/i386/i386/locore.s
+++ b/sys/arch/i386/i386/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.102 2006/05/07 11:30:51 kettenis Exp $	*/
+/*	$OpenBSD: locore.s,v 1.103 2006/05/11 13:21:11 mickey Exp $	*/
 /*	$NetBSD: locore.s,v 1.145 1996/05/03 19:41:19 christos Exp $	*/
 
 /*-
@@ -65,7 +65,7 @@
 
 #include <dev/isa/isareg.h>
 
-#if NLAPIC > 0 
+#if NLAPIC > 0
 #include <machine/i82489reg.h>
 #endif
 
@@ -100,16 +100,16 @@
 #define	PUSH_CURPROC(treg)				\
 	GET_CPUINFO(treg)			;	\
 	pushl	CPU_INFO_CURPROC(treg)
-       
+
 #define	CLEAR_CURPROC(treg)				\
 	GET_CPUINFO(treg)			;	\
 	movl	$0,CPU_INFO_CURPROC(treg)
-       
+
 #define	SET_CURPROC(proc,cpu)				\
 	GET_CPUINFO(cpu)			;	\
 	movl	proc,CPU_INFO_CURPROC(cpu)	;	\
 	movl	cpu,P_CPU(proc)
-       
+
 #define	GET_CURPCB(reg)					\
 	GET_CPUINFO(reg)			;	\
 	movl	CPU_INFO_CURPCB(reg),reg
@@ -126,7 +126,7 @@
 #define	CHECK_ASTPENDING(treg)				\
 	GET_CPUINFO(treg)			;	\
 	cmpl	$0,CPU_INFO_ASTPENDING(treg)
-               
+
 #define	CLEAR_ASTPENDING(cireg)				\
 	movl	$0,CPU_INFO_ASTPENDING(cireg)
 
@@ -1811,7 +1811,7 @@ switch_restored:
 	/* Restore cr0 (including FPU state). */
 	movl	PCB_CR0(%esi),%ecx
 #ifdef MULTIPROCESSOR
-	/* 
+	/*
 	 * If our floating point registers are on a different CPU,
 	 * clear CR0_TS so we'll trap rather than reuse bogus state.
 	 */
@@ -1839,7 +1839,7 @@ switch_return:
 	call	_C_LABEL(printf)
 	addl	$0xc,%esp
 #endif
-#if defined(MULTIPROCESSOR) || defined(LOCKDEBUG)     
+#if defined(MULTIPROCESSOR) || defined(LOCKDEBUG)
 	call    _C_LABEL(sched_unlock_idle)
 #endif
 	/*
@@ -2044,8 +2044,8 @@ IDTVEC(intrspurious)
 	 * The Pentium Pro local APIC may erroneously call this vector for a
 	 * default IR7.  Just ignore it.
 	 *
-	 * (The local APIC does this when CPL is raised while it's on the 
-	 * way to delivering an interrupt.. presumably enough has been set 
+	 * (The local APIC does this when CPL is raised while it's on the
+	 * way to delivering an interrupt.. presumably enough has been set
 	 * up that it's inconvenient to abort delivery completely..)
 	 */
 	iret
@@ -2089,7 +2089,7 @@ NENTRY(resume_pop_es)
 	movl	$GSEL(GDATA_SEL, SEL_KPL),%eax
 	movw	%ax,%gs
 NENTRY(resume_pop_gs)
-	pushl	%fs     
+	pushl	%fs
 	movl	$GSEL(GDATA_SEL, SEL_KPL),%eax
 	movw	%ax,%fs
 NENTRY(resume_pop_fs)
@@ -2120,7 +2120,7 @@ calltrap:
 	jmp	2b
 #ifndef DIAGNOSTIC
 1:	INTRFASTEXIT
-#else 
+#else
 1:	cmpl	CPL,%ebx
 	jne	3f
 	INTRFASTEXIT
@@ -2350,7 +2350,7 @@ ENTRY(cpu_paenable)
 	ret
 #endif /* !SMALL_KERNEL */
 
-#if NLAPIC > 0 
+#if NLAPIC > 0
 #include <i386/i386/apicvec.s>
 #endif
 
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 5291fb73dda..db2ea454c2b 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.353 2006/04/27 15:37:51 mickey Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.354 2006/05/11 13:21:11 mickey Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -1344,7 +1344,7 @@ natsem6x86_cpureset(void)
 	 * 2) Write 0xf to PCI Configuration Data Register (0xcfc)
 	 *    to reset IDE controller, IDE bus, and PCI bus, and
 	 *    to trigger a system-wide reset.
-	 * 
+	 *
 	 * See AMD Geode SC1100 Processor Data Book, Revision 2.0,
 	 * sections 6.3.1, 6.3.2, and 6.4.1.
 	 */
@@ -1438,7 +1438,7 @@ amd_family6_setup(struct cpu_info *ci)
 		k8_powernow_init();
 		break;
 	}
-#endif 
+#endif
 #endif
 }
 
diff --git a/sys/arch/i386/i386/mem.c b/sys/arch/i386/i386/mem.c
index f026881dd2a..99ade716983 100644
--- a/sys/arch/i386/i386/mem.c
+++ b/sys/arch/i386/i386/mem.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: mem.c,v 1.31 1996/05/03 19:42:19 christos Exp $	*/
-/*	$OpenBSD: mem.c,v 1.28 2005/11/13 14:23:26 martin Exp $ */
+/*	$OpenBSD: mem.c,v 1.29 2006/05/11 13:21:11 mickey Exp $ */
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -241,12 +241,12 @@ mmmmap(dev, off, prot)
 			else
 				return -1;
 		case 2:
-			/* Allow mapping of the whole 1st megabyte 
+			/* Allow mapping of the whole 1st megabyte
 			   for x86emu */
-			if (off <= BIOS_END || 
+			if (off <= BIOS_END ||
 			    (unsigned)off > (unsigned)ctob(physmem))
 				return atop(off);
-			else 
+			else
 				return -1;
 		default:
 			return -1;
@@ -283,7 +283,7 @@ mmioctl(dev, cmd, data, flags, p)
  * This is basically just an ioctl shim for mem_range_attr_get
  * and mem_range_attr_set.
  */
-static int 
+static int
 mem_ioctl(dev, cmd, data, flags, p)
 	dev_t dev;
 	u_long cmd;
@@ -317,7 +317,7 @@ mem_ioctl(dev, cmd, data, flags, p)
 				       M_MEMDESC, M_WAITOK);
 			error = mem_range_attr_get(md, &nd);
 			if (!error)
-				error = copyout(md, mo->mo_desc, 
+				error = copyout(md, mo->mo_desc,
 					nd * sizeof(struct mem_range_desc));
 			free(md, M_MEMDESC);
 		} else {
diff --git a/sys/arch/i386/i386/mtrr.c b/sys/arch/i386/i386/mtrr.c
index b786be81ae5..90e753e30c4 100644
--- a/sys/arch/i386/i386/mtrr.c
+++ b/sys/arch/i386/i386/mtrr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mtrr.c,v 1.6 2002/03/14 01:26:32 millert Exp $ */
+/* $OpenBSD: mtrr.c,v 1.7 2006/05/11 13:21:11 mickey Exp $ */
 /*-
  * Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
  * Copyright (c) 1999 Brian Fundakowski Feldman
@@ -63,8 +63,8 @@ mtrrattach (num)
 		   ((strcmp(cpu_vendor, "GenuineIntel") == 0) ||
 		    (strcmp(cpu_vendor, "AuthenticAMD") == 0))) {
 		mem_range_softc.mr_op = &i686_mrops;
-	    
-	} 
+
+	}
 	/* Initialise memory range handling */
 	if (mem_range_softc.mr_op != NULL)
 		mem_range_softc.mr_op->init(&mem_range_softc);
diff --git a/sys/arch/i386/i386/mutex.S b/sys/arch/i386/i386/mutex.S
index 7df8e5398f4..e9a3171c8d9 100644
--- a/sys/arch/i386/i386/mutex.S
+++ b/sys/arch/i386/i386/mutex.S
@@ -1,17 +1,17 @@
-/*	$OpenBSD: mutex.S,v 1.2 2005/04/08 07:07:06 jolan Exp $	*/
+/*	$OpenBSD: mutex.S,v 1.3 2006/05/11 13:21:11 mickey Exp $	*/
 
 /*
  * Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
- * All rights reserved. 
+ * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission. 
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -22,7 +22,7 @@
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "assym.h"
diff --git a/sys/arch/i386/i386/pmapae.c b/sys/arch/i386/i386/pmapae.c
index a121fd9d4d3..c87ca4dadc8 100644
--- a/sys/arch/i386/i386/pmapae.c
+++ b/sys/arch/i386/i386/pmapae.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmapae.c,v 1.1 2006/04/27 15:37:51 mickey Exp $	*/
+/*	$OpenBSD: pmapae.c,v 1.2 2006/05/11 13:21:11 mickey Exp $	*/
 
 /*
  * Copyright (c) 2006 Michael Shalayeff
@@ -153,7 +153,7 @@
  *
  * the first level table is called "page directory index" and consists
  * of 4 page directory index entries (PDIE) each 64 bits in size.
- * 
+ *
  * the second level table is called a "page directory" and it contains
  * 512 page directory entries (PDEs).   each PDE is
  * 8 bytes (a long long), so a PD fits in a single 4K page.   this page is
@@ -483,7 +483,7 @@ extern struct lock pmap_main_lock;
 #define	PDSHIFT		21		/* page directory address shift */
 #define	PT_MASK		0x001ff000	/* page table address bits */
 #undef	NBPD
-#define	NBPD		(1U << PDSHIFT)	/* # bytes mapped by PD (2MB) */ 
+#define	NBPD		(1U << PDSHIFT)	/* # bytes mapped by PD (2MB) */
 
 /*
  *
@@ -491,7 +491,7 @@ extern struct lock pmap_main_lock;
 #undef	PDSLOT_PTE
 #define	PDSLOT_PTE	(1660U)	/* 1660: for recursive PDP map */
 #undef	PDSLOT_KERN
-#define	PDSLOT_KERN	(1664U)	/* 1664: start of kernel space */  
+#define	PDSLOT_KERN	(1664U)	/* 1664: start of kernel space */
 #undef	PDSLOT_APTE
 #define	PDSLOT_APTE	(2044U)	/* 2044: alternative recursive slot */
 
diff --git a/sys/arch/i386/i386/powernow-k7.c b/sys/arch/i386/i386/powernow-k7.c
index f206fc5066c..242efaf445d 100644
--- a/sys/arch/i386/i386/powernow-k7.c
+++ b/sys/arch/i386/i386/powernow-k7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: powernow-k7.c,v 1.20 2006/05/02 16:14:51 pat Exp $ */
+/* $OpenBSD: powernow-k7.c,v 1.21 2006/05/11 13:21:11 mickey Exp $ */
 
 /*
  * Copyright (c) 2004 Martin Végiard.
@@ -279,7 +279,7 @@ k7pnow_states(struct k7pnow_cpu_state *cstate, uint32_t cpusig,
 	 * range for the pst tables; 16 byte blocks
 	 */
 	for (p = (u_int8_t *)ISA_HOLE_VADDR(BIOS_START);
-	    p < (u_int8_t *)ISA_HOLE_VADDR(BIOS_START + BIOS_LEN); p+= 
+	    p < (u_int8_t *)ISA_HOLE_VADDR(BIOS_START + BIOS_LEN); p+=
 	    BIOS_STEP) {
 		if (memcmp(p, "AMDK7PNOW!", 10) == 0) {
 			psb = (struct psb_s *)p;
@@ -360,7 +360,7 @@ k7_powernow_init(void)
 			    ci->ci_dev.dv_xname, techname, pentium_mhz);
 			for (i = cstate->n_states; i > 0; i--) {
 				state = &cstate->state_table[i-1];
-				printf(" %d", state->freq); 
+				printf(" %d", state->freq);
 			}
 			printf(" Mhz\n");	
 			
diff --git a/sys/arch/i386/i386/powernow-k8.c b/sys/arch/i386/i386/powernow-k8.c
index 3486a5f7b3f..6a944f82ae4 100644
--- a/sys/arch/i386/i386/powernow-k8.c
+++ b/sys/arch/i386/i386/powernow-k8.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: powernow-k8.c,v 1.9 2006/04/18 02:14:33 gwk Exp $ */
+/*	$OpenBSD: powernow-k8.c,v 1.10 2006/05/11 13:21:12 mickey Exp $ */
 
 /*
  * Copyright (c) 2004 Martin Végiard.
@@ -335,7 +335,7 @@ k8pnow_states(struct k8pnow_cpu_state *cstate, uint32_t cpusig,
 	int i;
 
 	for (p = (u_int8_t *)ISA_HOLE_VADDR(BIOS_START);
-	    p < (u_int8_t *)ISA_HOLE_VADDR(BIOS_START + BIOS_LEN); p += 
+	    p < (u_int8_t *)ISA_HOLE_VADDR(BIOS_START + BIOS_LEN); p +=
 	    BIOS_STEP) {
 		if (memcmp(p, "AMDK7PNOW!", 10) == 0) {
 			psb = (struct psb_s *)p;
diff --git a/sys/arch/i386/i386/svr4_machdep.c b/sys/arch/i386/i386/svr4_machdep.c
index e92e1a7017a..19885272a4f 100644
--- a/sys/arch/i386/i386/svr4_machdep.c
+++ b/sys/arch/i386/i386/svr4_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svr4_machdep.c,v 1.22 2006/01/12 22:39:21 weingart Exp $	*/
+/*	$OpenBSD: svr4_machdep.c,v 1.23 2006/05/11 13:21:12 mickey Exp $	*/
 /*	$NetBSD: svr4_machdep.c,v 1.24 1996/05/03 19:42:26 christos Exp $	 */
 
 /*
@@ -342,7 +342,7 @@ svr4_sendsig(catcher, sig, mask, code, type, val)
 		fp = (struct svr4_sigframe *)tf->tf_esp - 1;
 	}
 
-	/* 
+	/*
 	 * Build the argument list for the signal handler.
 	 * Notes:
 	 * 	- we always build the whole argument list, even when we
@@ -360,7 +360,7 @@ svr4_sendsig(catcher, sig, mask, code, type, val)
 	frame.sf_ucp = &fp->sf_uc;
 	frame.sf_handler = catcher;
 #ifdef DEBUG_SVR4
-	printf("sig = %d, sip %p, ucp = %p, handler = %p\n", 
+	printf("sig = %d, sip %p, ucp = %p, handler = %p\n",
 	       frame.sf_signum, frame.sf_sip, frame.sf_ucp, frame.sf_handler);
 #endif
 
diff --git a/sys/arch/i386/i386/sys_machdep.c b/sys/arch/i386/i386/sys_machdep.c
index 1f4e026f0a4..abbcd816cf9 100644
--- a/sys/arch/i386/i386/sys_machdep.c
+++ b/sys/arch/i386/i386/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.24 2006/01/05 20:09:18 matthieu Exp $	*/
+/*	$OpenBSD: sys_machdep.c,v 1.25 2006/05/11 13:21:12 mickey Exp $	*/
 /*	$NetBSD: sys_machdep.c,v 1.28 1996/05/03 19:42:29 christos Exp $	*/
 
 /*-
@@ -421,24 +421,24 @@ sys_sysarch(p, v, retval)
 
 	switch(SCARG(uap, op)) {
 #ifdef	USER_LDT
-	case I386_GET_LDT: 
+	case I386_GET_LDT:
 		error = i386_get_ldt(p, SCARG(uap, parms), retval);
 		break;
 
-	case I386_SET_LDT: 
+	case I386_SET_LDT:
 		error = i386_set_ldt(p, SCARG(uap, parms), retval);
 		break;
 #endif
 
-	case I386_IOPL: 
+	case I386_IOPL:
 		error = i386_iopl(p, SCARG(uap, parms), retval);
 		break;
 
-	case I386_GET_IOPERM: 
+	case I386_GET_IOPERM:
 		error = i386_get_ioperm(p, SCARG(uap, parms), retval);
 		break;
 
-	case I386_SET_IOPERM: 
+	case I386_SET_IOPERM:
 		error = i386_set_ioperm(p, SCARG(uap, parms), retval);
 		break;
 
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c
index 25c0fe7a0e3..330e6682b58 100644
--- a/sys/arch/i386/i386/trap.c
+++ b/sys/arch/i386/i386/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.73 2006/04/15 02:52:40 weingart Exp $	*/
+/*	$OpenBSD: trap.c,v 1.74 2006/05/11 13:21:12 mickey Exp $	*/
 /*	$NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $	*/
 
 /*-
@@ -126,11 +126,11 @@ userret(p, pc, oticks)
 	/*
 	 * If profiling, charge recent system time to the trapped pc.
 	 */
-	if (p->p_flag & P_PROFIL) { 
+	if (p->p_flag & P_PROFIL) {
 		extern int psratio;
 
 		addupc_task(p, pc, (int)(p->p_sticks - oticks) * psratio);
-	}                   
+	}
 
 	p->p_cpu->ci_schedstate.spc_curpriority = p->p_priority;
 }
@@ -318,7 +318,7 @@ trap(frame)
 		case 0x0f:	/* 0x0f prefix */
 			switch (*(u_char *)(frame.tf_eip+1)) {
 			case 0xa1:		/* popl %fs */
-				vframe = (void *)((int)&frame.tf_esp - 
+				vframe = (void *)((int)&frame.tf_esp -
 				    offsetof(struct trapframe, tf_fs));
 				resume = (int)resume_pop_fs;
 				break;
diff --git a/sys/arch/i386/i386/via.c b/sys/arch/i386/i386/via.c
index 57cfe70c215..d5af608b55d 100644
--- a/sys/arch/i386/i386/via.c
+++ b/sys/arch/i386/i386/via.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: via.c,v 1.3 2004/06/15 23:36:55 deraadt Exp $	*/
+/*	$OpenBSD: via.c,v 1.4 2006/05/11 13:21:12 mickey Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -238,7 +238,7 @@ viac3_crypto_process(struct cryptop *crp)
 	}
 	crd = crp->crp_desc;
 	if (crd == NULL || crd->crd_next != NULL ||
-	    crd->crd_alg != CRYPTO_AES_CBC || 
+	    crd->crd_alg != CRYPTO_AES_CBC ||
 	    (crd->crd_len % 16) != 0) {
 		err = EINVAL;
 		goto out;
diff --git a/sys/arch/i386/i386/vm86.c b/sys/arch/i386/i386/vm86.c
index 9b93fc802e4..906d071cb4d 100644
--- a/sys/arch/i386/i386/vm86.c
+++ b/sys/arch/i386/i386/vm86.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm86.c,v 1.15 2003/01/09 22:27:09 miod Exp $	*/
+/*	$OpenBSD: vm86.c,v 1.16 2006/05/11 13:21:12 mickey Exp $	*/
 /*	$NetBSD: vm86.c,v 1.15 1996/05/03 19:42:33 christos Exp $	*/
 
 /*-
@@ -178,14 +178,14 @@ fast_intxx(p, intrno)
 
 	u_long ss, sp;
 
-	/* 
+	/*
 	 * Note: u_vm86p points to user-space, we only compute offsets
 	 * and don't deref it. is_revectored() above does copyin() to
 	 * get stuff from it
 	 */
 	u_vm86p = (struct vm86_struct *)p->p_addr->u_pcb.vm86_userp;
 
-	/* 
+	/*
 	 * If user requested special handling, return to user space with
 	 * indication of which INT was requested.
 	 */
diff --git a/sys/arch/i386/i386/vm_machdep.c b/sys/arch/i386/i386/vm_machdep.c
index 433fcfd3724..70e1c717714 100644
--- a/sys/arch/i386/i386/vm_machdep.c
+++ b/sys/arch/i386/i386/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.43 2006/04/27 15:37:51 mickey Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.44 2006/05/11 13:21:12 mickey Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.61 1996/05/03 19:42:35 christos Exp $	*/
 
 /*-
@@ -181,7 +181,7 @@ cpu_wait(p)
 
 /*
  * Dump the machine specific segment at the start of a core dump.
- */     
+ */
 struct md_core {
 	struct reg intreg;
 	struct fpreg freg;
@@ -339,7 +339,7 @@ vmapbuf(struct buf *bp, vsize_t len)
 	 * The region is locked, so we expect that pmap_pte() will return
 	 * non-NULL.
 	 * XXX: unwise to expect this in a multithreaded environment.
-	 * anything can happen to a pmap between the time we lock a 
+	 * anything can happen to a pmap between the time we lock a
 	 * region, release the pmap lock, and then relock it for
 	 * the pmap_extract().
 	 *