diff --git a/sys/arch/sun3/sun3/autoconf.c b/sys/arch/sun3/sun3/autoconf.c
index 39df8ed556e5..a2117d6a23b9 100644
--- a/sys/arch/sun3/sun3/autoconf.c
+++ b/sys/arch/sun3/sun3/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.78 2012/10/13 06:37:16 tsutsui Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.79 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.78 2012/10/13 06:37:16 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.79 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -69,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.78 2012/10/13 06:37:16 tsutsui Exp $"
  * then choose root device (etc.)
  * Called by sys/kern/subr_autoconf.c: configure()
  */
-void 
+void
 cpu_configure(void)
 {
 
@@ -97,7 +97,7 @@ cpu_configure(void)
  * used config_found, then we would not have an opportunity to
  * setup the confargs for each child match and attach call.
  */
-int 
+int
 bus_scan(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
 {
 	struct confargs *ca = aux;
@@ -133,7 +133,7 @@ bus_scan(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
  * The parent name is non-NULL when there was no match
  * found by config_found().
  */
-int 
+int
 bus_print(void *args, const char *name)
 {
 	struct confargs *ca = args;
@@ -180,7 +180,7 @@ static struct prom_n2f prom_dev_table[] = {
 /*
  * Choose root and swap devices.
  */
-void 
+void
 cpu_rootconf(void)
 {
 	struct bootparam *bp;
@@ -296,7 +296,7 @@ xx_find(char *name, int ctlr, int unit)
  *	Try the access using peek_*
  *	Clean up temp. mapping
  */
-int 
+int
 bus_peek(int bustype, int pa, int sz)
 {
 	void *va;
@@ -323,7 +323,7 @@ bus_peek(int bustype, int pa, int sz)
 }
 
 /* from hp300: badbaddr() */
-int 
+int
 peek_byte(void *addr)
 {
 	label_t faultbuf;
@@ -339,7 +339,7 @@ peek_byte(void *addr)
 	return x;
 }
 
-int 
+int
 peek_word(void *addr)
 {
 	label_t faultbuf;
@@ -355,7 +355,7 @@ peek_word(void *addr)
 	return x;
 }
 
-int 
+int
 peek_long(void *addr)
 {
 	label_t faultbuf;
diff --git a/sys/arch/sun3/sun3/bus_subr.c b/sys/arch/sun3/sun3/bus_subr.c
index b70b62f634bb..c47b05269e6e 100644
--- a/sys/arch/sun3/sun3/bus_subr.c
+++ b/sys/arch/sun3/sun3/bus_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_subr.c,v 1.17 2008/04/28 20:23:38 martin Exp $	*/
+/*	$NetBSD: bus_subr.c,v 1.18 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_subr.c,v 1.17 2008/04/28 20:23:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_subr.c,v 1.18 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -113,7 +113,7 @@ bus_tmapin(int bustype, int pa)
 	return ((void *)(pgva + off));
 }
 
-void 
+void
 bus_tmapout(void *vp)
 {
 	vaddr_t pgva;
@@ -166,7 +166,7 @@ done:
 	return ((void*)(va + off));
 }
 
-void 
+void
 bus_mapout(void *ptr, int sz)
 {
 	vaddr_t va;
diff --git a/sys/arch/sun3/sun3/cache.c b/sys/arch/sun3/sun3/cache.c
index a3d0d35e1d05..276ecf3327a3 100644
--- a/sys/arch/sun3/sun3/cache.c
+++ b/sys/arch/sun3/sun3/cache.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cache.c,v 1.21 2009/11/21 04:16:52 rmind Exp $	*/
+/*	$NetBSD: cache.c,v 1.22 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.21 2009/11/21 04:16:52 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.22 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.21 2009/11/21 04:16:52 rmind Exp $");
 
 static void cache_clear_tags(void);
 
-void 
+void
 cache_flush_page(vaddr_t pgva)
 {
 	char *va, *endva;
@@ -90,7 +90,7 @@ cache_flush_page(vaddr_t pgva)
 	__asm volatile ("movc %0, %%dfc" : : "d" (old_dfc));
 }
 
-void 
+void
 cache_flush_segment(vaddr_t sgva)
 {
 	char *va, *endva;
@@ -119,7 +119,7 @@ cache_flush_segment(vaddr_t sgva)
 	__asm volatile ("movc %0, %%dfc" : : "d" (old_dfc));
 }
 
-void 
+void
 cache_flush_context(void)
 {
 	char *va, *endva;
@@ -145,7 +145,7 @@ cache_flush_context(void)
 	__asm volatile ("movc %0, %%dfc" : : "d" (old_dfc));
 }
 
-static void 
+static void
 cache_clear_tags(void)
 {
 	char *va, *endva;
@@ -171,7 +171,7 @@ cache_clear_tags(void)
 	__asm volatile ("movc %0, %%dfc" : : "d" (old_dfc));
 }
 
-void 
+void
 cache_enable(void)
 {
 	int enab_reg;
diff --git a/sys/arch/sun3/sun3/clock.c b/sys/arch/sun3/sun3/clock.c
index 4e0111c662fd..500a581a6fc5 100644
--- a/sys/arch/sun3/sun3/clock.c
+++ b/sys/arch/sun3/sun3/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.63 2010/12/20 00:25:45 matt Exp $	*/
+/*	$NetBSD: clock.c,v 1.64 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.63 2010/12/20 00:25:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.64 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -128,7 +128,7 @@ static void oclock_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(oclock, sizeof(struct intersil7170_softc),
     oclock_match, oclock_attach, NULL, NULL);
 
-static int 
+static int
 oclock_match(device_t parent, cfdata_t cf, void *aux)
 {
 	struct confargs *ca = aux;
@@ -148,7 +148,7 @@ oclock_match(device_t parent, cfdata_t cf, void *aux)
 	return 1;
 }
 
-static void 
+static void
 oclock_attach(device_t parent, device_t self, void *aux)
 {
 	struct intersil7170_softc *sc = device_private(self);
@@ -286,7 +286,7 @@ cpu_initclocks(void)
  * This doesn't need to do anything, as we have only one timer and
  * profhz==stathz==hz.
  */
-void 
+void
 setstatclockrate(int newhz)
 {
 
diff --git a/sys/arch/sun3/sun3/control.c b/sys/arch/sun3/sun3/control.c
index 9ee43967f8f6..670991749579 100644
--- a/sys/arch/sun3/sun3/control.c
+++ b/sys/arch/sun3/sun3/control.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: control.c,v 1.23 2008/04/28 20:23:38 martin Exp $	*/
+/*	$NetBSD: control.c,v 1.24 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,44 +30,44 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: control.c,v 1.23 2008/04/28 20:23:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: control.c,v 1.24 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 
 #include <machine/pte.h>
 #include <sun3/sun3/control.h>
 
-int 
+int
 get_context(void)
 {
 	return (get_control_byte(CONTEXT_REG) & CONTEXT_MASK);
 }
 
-void 
+void
 set_context(int c)
 {
 	set_control_byte(CONTEXT_REG, (c & CONTEXT_MASK));
 }
 
-u_int 
+u_int
 get_pte(vaddr_t va)
 {
 	return (get_control_word(CONTROL_ADDR_BUILD(PGMAP_BASE, va)));
 }
 
-void 
+void
 set_pte(vaddr_t va, u_int pte)
 {
 	set_control_word(CONTROL_ADDR_BUILD(PGMAP_BASE, va), pte);
 }
 
-int 
+int
 get_segmap(vaddr_t va)
 {
 	return (get_control_byte(CONTROL_ADDR_BUILD(SEGMAP_BASE, va)));
 }
 
-void 
+void
 set_segmap(vaddr_t va, int sme)
 {
 	set_control_byte(CONTROL_ADDR_BUILD(SEGMAP_BASE, va), sme);
diff --git a/sys/arch/sun3/sun3/db_machdep.c b/sys/arch/sun3/sun3/db_machdep.c
index 2abf385c8fca..20f6e3d6c587 100644
--- a/sys/arch/sun3/sun3/db_machdep.c
+++ b/sys/arch/sun3/sun3/db_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_machdep.c,v 1.27 2010/06/06 03:34:14 mrg Exp $	*/
+/*	$NetBSD: db_machdep.c,v 1.28 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.27 2010/06/06 03:34:14 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.28 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -71,12 +71,12 @@ const struct db_command db_machine_command_table[] = {
 /*
  * Machine-specific ddb commands for the sun3:
  *    abort:	Drop into monitor via abort (allows continue)
- *    halt: 	Exit to monitor as in halt(8)
+ *    halt:	Exit to monitor as in halt(8)
  *    reboot:	Reboot the machine as in reboot(8)
  *    pgmap:	Given addr, Print addr, segmap, pagemap, pte
  */
 
-static void 
+static void
 db_mach_abort(db_expr_t addr, bool have_addr, db_expr_t count,
     const char *modif)
 {
@@ -84,14 +84,14 @@ db_mach_abort(db_expr_t addr, bool have_addr, db_expr_t count,
 	sunmon_abort();
 }
 
-static void 
+static void
 db_mach_halt(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
 {
 
 	sunmon_halt();
 }
 
-static void 
+static void
 db_mach_reboot(db_expr_t addr, bool have_addr, db_expr_t count,
     const char *modif)
 {
@@ -102,7 +102,7 @@ db_mach_reboot(db_expr_t addr, bool have_addr, db_expr_t count,
 
 static void pte_print(int);
 
-static void 
+static void
 db_mach_pagemap(db_expr_t addr, bool have_addr, db_expr_t count,
     const char *modif)
 {
@@ -129,7 +129,7 @@ db_mach_pagemap(db_expr_t addr, bool have_addr, db_expr_t count,
 }
 
 #ifdef	_SUN3_
-static void 
+static void
 pte_print(int pte)
 {
 	int t;
@@ -159,7 +159,7 @@ pte_print(int pte)
 #endif	/* SUN3 */
 
 #ifdef	_SUN3X_
-static void 
+static void
 pte_print(int pte)
 {
 
diff --git a/sys/arch/sun3/sun3/db_memrw.c b/sys/arch/sun3/sun3/db_memrw.c
index c53168ca0623..14620a2b368a 100644
--- a/sys/arch/sun3/sun3/db_memrw.c
+++ b/sys/arch/sun3/sun3/db_memrw.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_memrw.c,v 1.27 2008/04/28 20:23:38 martin Exp $	*/
+/*	$NetBSD: db_memrw.c,v 1.28 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.27 2008/04/28 20:23:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.28 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -73,10 +73,10 @@ static void db_write_text(char *, size_t size, const char *);
  * This used to check for valid PTEs, but now that
  * traps in DDB work correctly, "Just Do It!"
  */
-void 
+void
 db_read_bytes(db_addr_t addr, size_t size, char *data)
 {
-	 char *src = (char *)addr;
+	char *src = (char *)addr;
 
 	if (size == 4) {
 		*((int *)data) = *((int *)src);
@@ -98,7 +98,7 @@ db_read_bytes(db_addr_t addr, size_t size, char *data)
  * Write bytes somewhere in kernel text.
  * Makes text page writable temporarily.
  */
-static void 
+static void
 db_write_text(char *dst, size_t size, const char *data)
 {
 	int oldpte, tmppte;
@@ -172,7 +172,7 @@ db_write_text(char *dst, size_t size, const char *data)
 /*
  * Write bytes to kernel address space for debugger.
  */
-void 
+void
 db_write_bytes(db_addr_t addr, size_t size, const char *data)
 {
 	char *dst = (char *)addr;
diff --git a/sys/arch/sun3/sun3/dvma.c b/sys/arch/sun3/sun3/dvma.c
index 3a9dee011b1f..7367c594c5f8 100644
--- a/sys/arch/sun3/sun3/dvma.c
+++ b/sys/arch/sun3/sun3/dvma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dvma.c,v 1.38 2012/01/29 16:24:01 para Exp $	*/
+/*	$NetBSD: dvma.c,v 1.39 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.38 2012/01/29 16:24:01 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.39 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -68,7 +68,7 @@ vsize_t dvma_segmap_size = 6 * NBSG;
 /* Using phys_map to manage DVMA scratch-memory pages. */
 /* Note: Could use separate pagemap for obio if needed. */
 
-void 
+void
 dvma_init(void)
 {
 	vaddr_t segmap_addr;
@@ -131,7 +131,7 @@ dvma_malloc(size_t bytes)
 /*
  * Free pages from dvma_malloc()
  */
-void 
+void
 dvma_free(void *addr, size_t size)
 {
 	vsize_t sz = m68k_round_page(size);
@@ -144,7 +144,7 @@ dvma_free(void *addr, size_t size)
  * would be used by some OTHER bus-master besides the CPU.
  * (Examples: on-board ie/le, VME xy board).
  */
-u_long 
+u_long
 dvma_kvtopa(void *kva, int bustype)
 {
 	u_long addr, mask;
@@ -233,7 +233,7 @@ dvma_mapin(void *kva, int len, int canwait /* ignored */)
  * This IS safe to call at interrupt time.
  * (Typically called at SPLBIO)
  */
-void 
+void
 dvma_mapout(void *dma, int len)
 {
 	vaddr_t seg_dma;
@@ -276,7 +276,7 @@ dvma_mapout(void *dma, int len)
 	splx(s);
 }
 
-int 
+int
 _bus_dmamap_load_raw(bus_dma_tag_t t, bus_dmamap_t map, bus_dma_segment_t *segs,
     int nsegs, bus_size_t size, int flags)
 {
@@ -350,7 +350,7 @@ _bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
 	return 0;
 }
 
-void 
+void
 _bus_dmamap_unload(bus_dma_tag_t t, bus_dmamap_t map)
 {
 	bus_dma_segment_t *segs;
diff --git a/sys/arch/sun3/sun3/enable.c b/sys/arch/sun3/sun3/enable.c
index cc19292561d1..1c79f876eea1 100644
--- a/sys/arch/sun3/sun3/enable.c
+++ b/sys/arch/sun3/sun3/enable.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: enable.c,v 1.7 2008/04/28 20:23:38 martin Exp $	*/
+/*	$NetBSD: enable.c,v 1.8 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: enable.c,v 1.7 2008/04/28 20:23:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: enable.c,v 1.8 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <dev/sun/fbio.h>
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: enable.c,v 1.7 2008/04/28 20:23:38 martin Exp $");
  * External interfaces to the system enable register.
  */
 
-void 
+void
 enable_fpu(int on)
 {
 	int s, ena;
@@ -61,7 +61,7 @@ enable_fpu(int on)
 	splx(s);
 }
 
-void 
+void
 enable_video(int on)
 {
 	int s, ena;
diff --git a/sys/arch/sun3/sun3/fpu_machdep.c b/sys/arch/sun3/sun3/fpu_machdep.c
index dbcc3561f8c8..ee47676392a8 100644
--- a/sys/arch/sun3/sun3/fpu_machdep.c
+++ b/sys/arch/sun3/sun3/fpu_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu_machdep.c,v 1.2 2012/06/28 17:53:42 tsutsui Exp $	*/
+/*	$NetBSD: fpu_machdep.c,v 1.3 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_machdep.c,v 1.2 2012/06/28 17:53:42 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_machdep.c,v 1.3 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include "opt_fpu_emulate.h"
 
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_machdep.c,v 1.2 2012/06/28 17:53:42 tsutsui Exp
 
 static const char *fpu_descr[] = {
 #ifdef	FPU_EMULATE
-	"emulator", 		/* 0 */
+	"emulator",		/* 0 */
 #else
 	"no math support",	/* 0 */
 #endif
@@ -58,7 +58,7 @@ static const char *fpu_descr[] = {
 	"mc68060 internal",	/* 4 */
 	"unknown type" };	/* 5 */
 
-void 
+void
 initfpu(void)
 {
 	const char *descr;
diff --git a/sys/arch/sun3/sun3/genassym.cf b/sys/arch/sun3/sun3/genassym.cf
index e6ef03853fd3..23477dab0786 100644
--- a/sys/arch/sun3/sun3/genassym.cf
+++ b/sys/arch/sun3/sun3/genassym.cf
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.14 2010/10/15 15:55:53 tsutsui Exp $
+#	$NetBSD: genassym.cf,v 1.15 2013/09/07 15:56:11 tsutsui Exp $
 
 #
 # Copyright (c) 1982, 1990, 1993
@@ -189,7 +189,7 @@ define	PCB_FPCTX		offsetof(struct pcb, pcb_fpregs)
 define	SIZEOF_PCB		sizeof(struct pcb)
 
 # frame offsets
-define 	TF_PC			offsetof(struct frame, f_pc)
+define	TF_PC			offsetof(struct frame, f_pc)
 
 # exception frame offset/sizes
 define	FR_SP			offsetof(struct trapframe, tf_regs[15])
diff --git a/sys/arch/sun3/sun3/idprom.c b/sys/arch/sun3/sun3/idprom.c
index bf9ff64bcc80..6a3a431b8355 100644
--- a/sys/arch/sun3/sun3/idprom.c
+++ b/sys/arch/sun3/sun3/idprom.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: idprom.c,v 1.29 2008/04/28 20:23:38 martin Exp $	*/
+/*	$NetBSD: idprom.c,v 1.30 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: idprom.c,v 1.29 2008/04/28 20:23:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: idprom.c,v 1.30 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,7 +66,7 @@ static int idprom_hostid(void);
  * verify the checksum,
  * set the hostid...
  */
-void 
+void
 idprom_init(void)
 {
 
@@ -92,7 +92,7 @@ idprom_cksum(u_char *p)
 	return (x);
 }
 
-static int 
+static int
 idprom_hostid(void)
 {
 	struct idprom *idp;
diff --git a/sys/arch/sun3/sun3/intreg.c b/sys/arch/sun3/sun3/intreg.c
index e6b171aa1c2e..e305c9a9a898 100644
--- a/sys/arch/sun3/sun3/intreg.c
+++ b/sys/arch/sun3/sun3/intreg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: intreg.c,v 1.29 2008/06/28 12:13:38 tsutsui Exp $	*/
+/*	$NetBSD: intreg.c,v 1.30 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intreg.c,v 1.29 2008/06/28 12:13:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intreg.c,v 1.30 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -68,7 +68,7 @@ volatile uint8_t *interrupt_reg;
 static int intreg_attached;
 
 /* called early (by internal_configure) */
-void 
+void
 intreg_init(void)
 {
 	vaddr_t va;
@@ -84,7 +84,7 @@ intreg_init(void)
 }
 
 
-static int 
+static int
 intreg_match(device_t parent, cfdata_t cf, void *args)
 {
 	struct confargs *ca = args;
@@ -101,7 +101,7 @@ intreg_match(device_t parent, cfdata_t cf, void *args)
 }
 
 
-static void 
+static void
 intreg_attach(device_t parent, device_t self, void *args)
 {
 	struct intreg_softc *sc = device_private(self);
@@ -116,7 +116,7 @@ intreg_attach(device_t parent, device_t self, void *args)
 
 
 #if 0
-void 
+void
 isr_soft_request(int level)
 {
 	uint8_t bit;
@@ -128,7 +128,7 @@ isr_soft_request(int level)
 	single_inst_bset_b(*interrupt_reg, bit);
 }
 
-void 
+void
 isr_soft_clear(int level)
 {
 	uint8_t bit;
diff --git a/sys/arch/sun3/sun3/leds.c b/sys/arch/sun3/sun3/leds.c
index accf1fc4b683..d7fac80bd458 100644
--- a/sys/arch/sun3/sun3/leds.c
+++ b/sys/arch/sun3/sun3/leds.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: leds.c,v 1.13 2008/04/28 20:23:38 martin Exp $	*/
+/*	$NetBSD: leds.c,v 1.14 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: leds.c,v 1.13 2008/04/28 20:23:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: leds.c,v 1.14 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -86,7 +86,7 @@ static struct led_patterns ledpat = {
  * This is called early during startup to find the
  * diag register (LEDs) and turn on the light(s).
  */
-void 
+void
 leds_init(void)
 {
 #ifdef	_SUN3X_
@@ -105,7 +105,7 @@ leds_init(void)
 /*
  * This is called by the clock interrupt.
  */
-void 
+void
 leds_intr(void)
 {
 	u_char i;
diff --git a/sys/arch/sun3/sun3/locore.s b/sys/arch/sun3/sun3/locore.s
index 372b9df2dde9..5a0fd2c5ec56 100644
--- a/sys/arch/sun3/sun3/locore.s
+++ b/sys/arch/sun3/sun3/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.95 2011/12/22 15:33:30 tsutsui Exp $	*/
+/*	$NetBSD: locore.s,v 1.96 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -257,7 +257,7 @@ sun3_mmu_specific:
 	movsb BUSERR_REG,%d0		| get value of bus error register
 	movc %d1,%sfc			| restore %sfc
 	movl %sp@+,%d1			| restore %d1
-	andb #BUSERR_MMU,%d0 		| is this an MMU fault?
+	andb #BUSERR_MMU,%d0		| is this an MMU fault?
 	jeq Lisberr			| non-MMU bus error
 /* End of sun3 specific code. */
 
@@ -403,7 +403,7 @@ ASLOCAL(kbrkpt)
 	| (so debugger can change the stack pointer)
 	movl	%a6,%d1
 	cmpl	#_ASM_LABEL(tmpstk),%d1
-	jls	Lbrkpt2 		| already on tmpstk
+	jls	Lbrkpt2			| already on tmpstk
 	| Copy frame to the temporary stack
 	movl	%sp,%a0			| %a0=src
 	lea	_ASM_LABEL(tmpstk)-96,%a1	| %a1=dst
@@ -681,7 +681,7 @@ ENTRY(_splraise)
 	clrl	%d0
 	movw	%sr,%d0
 	movl	%d0,%d1
-	andl	#PSL_HIGHIPL,%d1 	| old &= PSL_HIGHIPL
+	andl	#PSL_HIGHIPL,%d1	| old &= PSL_HIGHIPL
 	cmpl	%sp@(4),%d1		| (old - new)
 	bge	Lsplr
 	movl	%sp@(4),%d1
diff --git a/sys/arch/sun3/sun3/locore2.c b/sys/arch/sun3/sun3/locore2.c
index a529ae369b21..09a7d572f085 100644
--- a/sys/arch/sun3/sun3/locore2.c
+++ b/sys/arch/sun3/sun3/locore2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore2.c,v 1.100 2012/08/10 14:33:35 tsutsui Exp $	*/
+/*	$NetBSD: locore2.c,v 1.101 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.100 2012/08/10 14:33:35 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.101 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_modular.h"
@@ -111,7 +111,7 @@ static void _save_symtab(void);
 /*
  * Preserve DDB symbols and strings by setting esym.
  */
-static void 
+static void
 _save_symtab(void)
 {
 	int i;
@@ -175,7 +175,7 @@ _save_symtab(void)
  * Once that is done, pmap_bootstrap() is called to do the
  * usual preparations for our use of the MMU.
  */
-static void 
+static void
 _vm_init(void)
 {
 	vaddr_t nextva;
@@ -228,7 +228,7 @@ _vm_init(void)
  * XXX: move the rest of this to identifycpu().
  * XXX: Move cache_size stuff to cache.c.
  */
-static void 
+static void
 _verify_hardware(void)
 {
 	unsigned char machtype;
@@ -272,7 +272,7 @@ _verify_hardware(void)
 	case ID_SUN3_260:
 		cpu_match++;
 		cpu_string = "260";
-		delay_divisor = 82; 	/* 25 MHz */
+		delay_divisor = 82;	/* 25 MHz */
 		cpu_has_vme = true;
 #ifdef	HAVECACHE
 		cache_size = 0x10000;	/* 64K */
@@ -303,7 +303,7 @@ _verify_hardware(void)
  * hp300 port (and other m68k) but which we prefer to do in C code.
  * Also do setup specific to the Sun PROM monitor and IDPROM here.
  */
-void 
+void
 _bootstrap(void)
 {
 	extern struct consdev consdev_prom;	/* XXX */
diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c
index ddf3bb712d40..8199aa787dd6 100644
--- a/sys/arch/sun3/sun3/machdep.c
+++ b/sys/arch/sun3/sun3/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.206 2012/07/28 19:08:25 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.207 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.206 2012/07/28 19:08:25 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.207 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -147,7 +147,7 @@ extern char etext[];
 const vaddr_t kernbase = KERNBASE3;
 const vaddr_t kern_end = KERN_END3;
 
-/* Our exported CPU info; we can have only one. */  
+/* Our exported CPU info; we can have only one. */
 struct cpu_info cpu_info_store;
 
 struct vm_map *phys_map = NULL;
@@ -170,7 +170,7 @@ static void initcpu(void);
  * to use the console for output immediately (via PROM)
  * but can not use it for input until after this point.
  */
-void 
+void
 consinit(void)
 {
 
@@ -213,7 +213,7 @@ consinit(void)
  * kernel memory allocator is ready for use, but before
  * the creation of processes 1,2, and mountroot, etc.
  */
-void 
+void
 cpu_startup(void)
 {
 	char *v;
@@ -293,7 +293,7 @@ char	cpu_model[120];
  * the video memory on the Sun3/50.  Therefore, this
  * function just prints out what we already know.
  */
-void 
+void
 identifycpu(void)
 {
 	extern char *cpu_string;	/* XXX */
@@ -381,7 +381,7 @@ reboot_sync(void)
 /*
  * Common part of the BSD and SunOS reboot system calls.
  */
-__dead void 
+__dead void
 cpu_reboot(int howto, char *user_boot_string)
 {
 	char *bs, *p;
@@ -461,10 +461,10 @@ cpu_reboot(int howto, char *user_boot_string)
  * These variables are needed by /sbin/savecore
  */
 uint32_t dumpmag = 0x8fca0101;	/* magic number */
-int 	dumpsize = 0;		/* pages */
-long	dumplo = 0; 		/* blocks */
+int	dumpsize = 0;		/* pages */
+long	dumplo = 0;		/* blocks */
 
-#define	DUMP_EXTRA 	3	/* CPU-dependent extra pages */
+#define	DUMP_EXTRA	3	/* CPU-dependent extra pages */
 
 /*
  * This is called by main to set dumplo, dumpsize.
@@ -473,7 +473,7 @@ long	dumplo = 0; 		/* blocks */
  * If there is extra space, put dump at the end to
  * reduce the chance that swapping trashes it.
  */
-void 
+void
 cpu_dumpconf(void)
 {
 	int devblks;	/* size of dump device in blocks */
@@ -517,7 +517,7 @@ extern paddr_t avail_start;
  *   pagemap (2*PAGE_SIZE)
  *   physical memory...
  */
-void 
+void
 dumpsys(void)
 {
 	const struct bdevsw *dsw;
@@ -655,7 +655,7 @@ fail:
 	printf(" dump error=%d\n", error);
 }
 
-static void 
+static void
 initcpu(void)
 {
 	/* XXX: Enable RAM parity/ECC checking? */
@@ -681,7 +681,7 @@ initcpu(void)
  * Determine if the given exec package refers to something which we
  * understand and, if so, set up the vmcmds for it.
  */
-int 
+int
 cpu_exec_aout_makecmds(struct lwp *l, struct exec_package *epp)
 {
 	return ENOEXEC;
@@ -701,7 +701,7 @@ bool
 mm_md_direct_mapped_phys(paddr_t paddr, vaddr_t *vaddr)
 {
 
-	if (paddr >= avail_start) 
+	if (paddr >= avail_start)
 		return false;
 	*vaddr = KERNBASE3 + paddr;
 	return true;
diff --git a/sys/arch/sun3/sun3/machdep.h b/sys/arch/sun3/sun3/machdep.h
index f4a0e63da4bd..43fd14aeaf90 100644
--- a/sys/arch/sun3/sun3/machdep.h
+++ b/sys/arch/sun3/sun3/machdep.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.h,v 1.37 2011/05/16 13:22:55 tsutsui Exp $	*/
+/*	$NetBSD: machdep.h,v 1.38 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -113,7 +113,7 @@ void	enable_fpu(int);
 void	enable_init(void);
 void	enable_video(int);
 
-int 	fpu_emulate(struct trapframe *, struct fpframe *, ksiginfo_t *);
+int	fpu_emulate(struct trapframe *, struct fpframe *, ksiginfo_t *);
 
 /* Backward compatibility... */
 #define getsr	_getsr
@@ -184,7 +184,7 @@ void	loadcrp(struct mmu_rootptr *);
 
 void	pmap_bootstrap(vaddr_t);
 void	pmap_kcore_hdr(struct sun3x_kcore_hdr *);
-int 	pmap_pa_exists(paddr_t);
+int	pmap_pa_exists(paddr_t);
 
 #endif	/* SUN3X */
 
diff --git a/sys/arch/sun3/sun3/mainbus.c b/sys/arch/sun3/sun3/mainbus.c
index 987d4e6bbc8f..86d37a1e2a12 100644
--- a/sys/arch/sun3/sun3/mainbus.c
+++ b/sys/arch/sun3/sun3/mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.17 2008/06/28 12:13:38 tsutsui Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.18 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.17 2008/06/28 12:13:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.18 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.17 2008/06/28 12:13:38 tsutsui Exp $")
 
 #include <machine/autoconf.h>
 
-static int 	main_match(device_t, cfdata_t, void *);
+static int	main_match(device_t, cfdata_t, void *);
 static void	main_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(mainbus, 0,
@@ -47,7 +47,7 @@ CFATTACH_DECL_NEW(mainbus, 0,
 /*
  * Probe for the mainbus; always succeeds.
  */
-static int 
+static int
 main_match(device_t parent, cfdata_t cf, void *aux)
 {
 
@@ -59,7 +59,7 @@ main_match(device_t parent, cfdata_t cf, void *aux)
  * This controls the order of autoconfig for important things
  * used early.  For example, idprom is used by Ether drivers.
  */
-static void 
+static void
 main_attach(device_t parent, device_t self, void *args)
 {
 	struct confargs ca;
diff --git a/sys/arch/sun3/sun3/mm_md.c b/sys/arch/sun3/sun3/mm_md.c
index 5e66d8b057f7..19b8f589a67b 100644
--- a/sys/arch/sun3/sun3/mm_md.c
+++ b/sys/arch/sun3/sun3/mm_md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mm_md.c,v 1.2 2011/06/12 03:35:48 rmind Exp $	*/
+/*	$NetBSD: mm_md.c,v 1.3 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mm_md.c,v 1.2 2011/06/12 03:35:48 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mm_md.c,v 1.3 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -92,8 +92,8 @@ __KERNEL_RCSID(0, "$NetBSD: mm_md.c,v 1.2 2011/06/12 03:35:48 rmind Exp $");
 #define DEV_VME16D32	8	/* minor device 8 is /dev/vme16d32 */
 #define DEV_VME24D32	9	/* minor device 9 is /dev/vme24d32 */
 #define DEV_VME32D32	10	/* minor device 10 is /dev/vme32d32 */
-#define DEV_EEPROM	11 	/* minor device 11 is eeprom */
-#define DEV_LEDS	13 	/* minor device 13 is leds */
+#define DEV_EEPROM	11	/* minor device 11 is eeprom */
+#define DEV_LEDS	13	/* minor device 13 is leds */
 
 int
 mm_md_readwrite(dev_t dev, struct uio *uio)
@@ -109,7 +109,7 @@ mm_md_readwrite(dev_t dev, struct uio *uio)
 	}
 }
 
-paddr_t 
+paddr_t
 mm_md_mmap(dev_t dev, off_t off, int prot)
 {
 
diff --git a/sys/arch/sun3/sun3/obio.c b/sys/arch/sun3/sun3/obio.c
index f882b1318f77..086ce2c97867 100644
--- a/sys/arch/sun3/sun3/obio.c
+++ b/sys/arch/sun3/sun3/obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.56 2008/06/28 12:13:38 tsutsui Exp $	*/
+/*	$NetBSD: obio.c,v 1.57 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.56 2008/06/28 12:13:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.57 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -87,7 +87,7 @@ static struct sun68k_bus_space_tag obio_space_tag = {
 
 static struct sun68k_bus_dma_tag obio_dma_tag;
 
-static int 
+static int
 obio_match(device_t parent, cfdata_t cf, void *aux)
 {
 	struct confargs *ca = aux;
@@ -113,7 +113,7 @@ obio_match(device_t parent, cfdata_t cf, void *aux)
 #define OBIO_INCR	0x020000
 #define OBIO_END	0x200000
 
-static void 
+static void
 obio_attach(device_t parent, device_t self, void *aux)
 {
 	struct confargs *ca = aux;
@@ -156,7 +156,7 @@ obio_attach(device_t parent, device_t self, void *aux)
  * Print out the confargs.  The (parent) name is non-NULL
  * when there was no match found by config_found().
  */
-static int 
+static int
 obio_print(void *args, const char *name)
 {
 
@@ -168,7 +168,7 @@ obio_print(void *args, const char *name)
 	return bus_print(args, name);
 }
 
-int 
+int
 obio_submatch(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
 {
 	struct confargs *ca = aux;
@@ -375,7 +375,7 @@ make_required_mappings(void)
  * normal autoconfiguration calls configure().  Warning: this is
  * called before pmap_bootstrap, so no allocation allowed!
  */
-void 
+void
 obio_init(void)
 {
 
diff --git a/sys/arch/sun3/sun3/obmem.c b/sys/arch/sun3/sun3/obmem.c
index 295ef288ff6b..f7b8bf9167c1 100644
--- a/sys/arch/sun3/sun3/obmem.c
+++ b/sys/arch/sun3/sun3/obmem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obmem.c,v 1.26 2008/06/28 12:13:38 tsutsui Exp $	*/
+/*	$NetBSD: obmem.c,v 1.27 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obmem.c,v 1.26 2008/06/28 12:13:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obmem.c,v 1.27 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -79,7 +79,7 @@ static struct sun68k_bus_space_tag obmem_space_tag = {
 	NULL				/* bus_space_poke_N */
 };
 
-static int 
+static int
 obmem_match(device_t parent, cfdata_t cf, void *aux)
 {
 	struct confargs *ca = aux;
@@ -96,7 +96,7 @@ obmem_match(device_t parent, cfdata_t cf, void *aux)
 	return 1;
 }
 
-static void 
+static void
 obmem_attach(device_t parent, device_t self, void *aux)
 {
 	struct confargs *ca = aux;
diff --git a/sys/arch/sun3/sun3/pmap.c b/sys/arch/sun3/sun3/pmap.c
index 9850024f9ea7..6ff30c96a2fc 100644
--- a/sys/arch/sun3/sun3/pmap.c
+++ b/sys/arch/sun3/sun3/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.168 2013/01/07 16:58:09 chs Exp $	*/
+/*	$NetBSD: pmap.c,v 1.169 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.168 2013/01/07 16:58:09 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.169 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
@@ -479,7 +479,7 @@ pmeg_p(int sme)
 
 #define is_pmeg_wired(pmegp) (pmegp->pmeg_wired != 0)
 
-static void 
+static void
 pmeg_set_wiring(pmeg_t pmegp, vaddr_t va, int flag)
 {
 	int idx, mask;
@@ -498,7 +498,7 @@ pmeg_set_wiring(pmeg_t pmegp, vaddr_t va, int flag)
  */
 
 /* part of pmap_bootstrap */
-static void 
+static void
 context_init(void)
 {
 	int i;
@@ -523,7 +523,7 @@ context_init(void)
 }
 
 /* Get us a context (steal one if necessary). */
-static void 
+static void
 context_allocate(pmap_t pmap)
 {
 	context_t context;
@@ -575,7 +575,7 @@ context_allocate(pmap_t pmap)
 /*
  * Unload the context and put it on the free queue.
  */
-static void 
+static void
 context_free(pmap_t pmap)
 {
 	int saved_ctxnum, ctxnum;
@@ -646,7 +646,7 @@ context_free(pmap_t pmap)
  * PMEG management functions.
  */
 
-static void 
+static void
 pmeg_init(void)
 {
 	int x;
@@ -673,7 +673,7 @@ pmeg_init(void)
  * Reserve a pmeg (forever) for use by PROM, etc.
  * Contents are left as-is.  Called very early...
  */
-void 
+void
 pmeg_reserve(int sme)
 {
 	pmeg_t pmegp;
@@ -701,7 +701,7 @@ pmeg_reserve(int sme)
  * Examine PMEGs used by the monitor, and either
  * reserve them (keep=1) or clear them (keep=0)
  */
-static void 
+static void
 pmeg_mon_init(vaddr_t sva, vaddr_t eva, int keep)
 {
 	vaddr_t pgva, endseg;
@@ -745,7 +745,7 @@ pmeg_mon_init(vaddr_t sva, vaddr_t eva, int keep)
  * This is used only during pmap_bootstrap, so we can
  * get away with borrowing a slot in the segmap.
  */
-static void 
+static void
 pmeg_clean(pmeg_t pmegp)
 {
 	int sme;
@@ -770,7 +770,7 @@ pmeg_clean(pmeg_t pmegp)
  * puts them at the end.  The ending condition is finding the first
  * queue element at the head of the queue again.
  */
-static void 
+static void
 pmeg_clean_free(void)
 {
 	pmeg_t pmegp, pmegp_first;
@@ -802,7 +802,7 @@ pmeg_clean_free(void)
  * Allocate a PMEG by whatever means necessary.
  * (May invalidate some mappings!)
  */
-static pmeg_t 
+static pmeg_t
 pmeg_allocate(pmap_t pmap, vaddr_t va)
 {
 	pmeg_t pmegp;
@@ -880,7 +880,7 @@ pmeg_allocate(pmap_t pmap, vaddr_t va)
  * This happens when we loose our context.  We may reclaim
  * this pmeg later if it is still in the inactive queue.
  */
-static void 
+static void
 pmeg_release(pmeg_t pmegp)
 {
 
@@ -901,7 +901,7 @@ pmeg_release(pmeg_t pmegp)
  * Move the pmeg to the free queue from wherever it is.
  * The pmeg will be clean.  It might be in kernel_pmap.
  */
-static void 
+static void
 pmeg_free(pmeg_t pmegp)
 {
 
@@ -945,7 +945,7 @@ pmeg_free(pmeg_t pmegp)
  * Find a PMEG that was put on the inactive queue when we
  * had our context stolen.  If found, move to active queue.
  */
-static pmeg_t 
+static pmeg_t
 pmeg_cache(pmap_t pmap, vaddr_t va)
 {
 	int sme, segnum;
@@ -1012,7 +1012,7 @@ pmeg_cache(pmap_t pmap, vaddr_t va)
 }
 
 #ifdef	PMAP_DEBUG
-static void 
+static void
 pmeg_verify_empty(vaddr_t va)
 {
 	vaddr_t eva;
@@ -1035,7 +1035,7 @@ pmeg_verify_empty(vaddr_t va)
  * there is one list head for each physical page, and
  * at most one element for each PMEG slot.
  */
-static void 
+static void
 pv_init(void)
 {
 	int npp, nvp, sz;
@@ -1089,7 +1089,7 @@ pv_init(void)
  * Set or clear bits in all PTEs mapping a page.
  * Also does syncflags work while we are there...
  */
-static void 
+static void
 pv_changepte(paddr_t pa, int set_bits, int clear_bits)
 {
 	pv_entry_t *head, pv;
@@ -1193,7 +1193,7 @@ pv_changepte(paddr_t pa, int set_bits, int clear_bits)
  * Return ref and mod bits from pvlist,
  * and turns off same in hardware PTEs.
  */
-static u_int 
+static u_int
 pv_syncflags(pv_entry_t pv)
 {
 	pmap_t pmap;
@@ -1285,7 +1285,7 @@ pv_syncflags(pv_entry_t pv)
 }
 
 /* Remove all mappings for the physical page. */
-static void 
+static void
 pv_remove_all(paddr_t pa)
 {
 	pv_entry_t *head, pv;
@@ -1322,7 +1322,7 @@ pv_remove_all(paddr_t pa)
  * Returns PV_NC if the (new) pvlist says that the address cannot
  * be cached.
  */
-static int 
+static int
 pv_link(pmap_t pmap, int pte, vaddr_t va)
 {
 	paddr_t pa;
@@ -1401,7 +1401,7 @@ pv_link(pmap_t pmap, int pte, vaddr_t va)
  * definition nonempty, since it must have at least two elements
  * in it to have PV_NC set, and we only remove one here.)
  */
-static void 
+static void
 pv_unlink(pmap_t pmap, int pte, vaddr_t va)
 {
 	paddr_t pa;
@@ -1478,7 +1478,7 @@ pv_unlink(pmap_t pmap, int pte, vaddr_t va)
  * Bootstrap and Initialization, etc.
  */
 
-void 
+void
 pmap_common_init(pmap_t pmap)
 {
 	memset(pmap, 0, sizeof(struct pmap));
@@ -1493,7 +1493,7 @@ pmap_common_init(pmap_t pmap)
  * after the "start/end" globals are set.
  * This function must NOT leave context zero.
  */
-void 
+void
 pmap_bootstrap(vaddr_t nextva)
 {
 	struct sunromvec *rvec;
@@ -1750,7 +1750,7 @@ pmap_bootstrap(vaddr_t nextva)
  * because this lets pmap_remove() and pmap_protect()
  * use a S/W copy of the segmap to avoid function calls.
  */
-void 
+void
 pmap_kernel_init(pmap_t pmap)
 {
 	vaddr_t va;
@@ -1776,7 +1776,7 @@ pmap_kernel_init(pmap_t pmap)
  * How much virtual space does this kernel have?
  * (After mapping kernel text, data, etc.)
  */
-void 
+void
 pmap_virtual_space(vaddr_t *v_start, vaddr_t *v_end)
 {
 	*v_start = virtual_avail;
@@ -1784,7 +1784,7 @@ pmap_virtual_space(vaddr_t *v_start, vaddr_t *v_end)
 }
 
 /* Provide memory to the VM system. */
-static void 
+static void
 pmap_page_upload(void)
 {
 	int a, b, c, d;
@@ -1813,7 +1813,7 @@ pmap_page_upload(void)
  *	Called by vm_init, to initialize any structures that the pmap
  *	system needs to map virtual memory.
  */
-void 
+void
 pmap_init(void)
 {
 	pv_init();
@@ -1829,7 +1829,7 @@ pmap_init(void)
  * record the mapping for kernel text/data/bss.
  * Return VA following the mapped range.
  */
-vaddr_t 
+vaddr_t
 pmap_map(vaddr_t va, paddr_t pa, paddr_t endpa, int prot)
 {
 	int sz;
@@ -1845,7 +1845,7 @@ pmap_map(vaddr_t va, paddr_t pa, paddr_t endpa, int prot)
 	return(va);
 }
 
-void 
+void
 pmap_user_init(pmap_t pmap)
 {
 	int i;
@@ -1867,7 +1867,7 @@ pmap_user_init(pmap_t pmap)
  *	the map will be used in software only, and
  *	is bounded by that size.
  */
-pmap_t 
+pmap_t
 pmap_create(void)
 {
 	pmap_t pmap;
@@ -1882,7 +1882,7 @@ pmap_create(void)
  * Called when a pmap initialized by pmap_pinit is being released.
  * Should only be called if the map contains no valid mappings.
  */
-void 
+void
 pmap_release(struct pmap *pmap)
 {
 	int s;
@@ -1912,7 +1912,7 @@ pmap_release(struct pmap *pmap)
  *	Should only be called if the map contains
  *	no valid mappings.
  */
-void 
+void
 pmap_destroy(pmap_t pmap)
 {
 	int count;
@@ -1933,7 +1933,7 @@ pmap_destroy(pmap_t pmap)
 /*
  *	Add a reference to the specified pmap.
  */
-void 
+void
 pmap_reference(pmap_t pmap)
 {
 
@@ -1957,7 +1957,7 @@ pmap_reference(pmap_t pmap)
  *	or lose information.  That is, this routine must actually
  *	insert this page into the given map NOW.
  */
-int 
+int
 pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags)
 {
 	int new_pte, s;
@@ -2005,7 +2005,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags)
 	return 0;
 }
 
-static void 
+static void
 pmap_enter_kernel(vaddr_t pgva, int new_pte, bool wired)
 {
 	pmap_t pmap = kernel_pmap;
@@ -2148,7 +2148,7 @@ add_pte:	/* can be destructive */
 }
 
 
-static void 
+static void
 pmap_enter_user(pmap_t pmap, vaddr_t pgva, int new_pte, bool wired)
 {
 	int do_pv, old_pte, sme;
@@ -2323,7 +2323,7 @@ pmap_enter_user(pmap_t pmap, vaddr_t pgva, int new_pte, bool wired)
 	pmegp->pmeg_vpages++;
 }
 
-void 
+void
 pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags)
 {
 	int new_pte, s;
@@ -2432,7 +2432,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags)
 	splx(s);
 }
 
-void 
+void
 pmap_kremove(vaddr_t va, vsize_t len)
 {
 	pmap_t pmap = kernel_pmap;
@@ -2541,7 +2541,7 @@ pmap_kremove(vaddr_t va, vsize_t len)
  *
  * XXX: Merge this with the next function?
  */
-int 
+int
 _pmap_fault(struct vm_map *map, vaddr_t va, vm_prot_t ftype)
 {
 	pmap_t pmap;
@@ -2582,7 +2582,7 @@ _pmap_fault(struct vm_map *map, vaddr_t va, vm_prot_t ftype)
  *	it has a valid PTE at va.
  * Otherwise return zero and let VM code handle it.
  */
-int 
+int
 pmap_fault_reload(pmap_t pmap, vaddr_t pgva, vm_prot_t ftype)
 {
 	int rv, s, pte, chkpte, sme;
@@ -2761,7 +2761,7 @@ pmap_is_referenced(struct vm_page *pg)
  * need our own context for user-space mappings in
  * pmap_enter_user().
  */
-void 
+void
 _pmap_switch(pmap_t pmap)
 {
 	set_context(pmap->pm_ctxnum);
@@ -2774,7 +2774,7 @@ _pmap_switch(pmap_t pmap)
  * If (p == curlwp) do like cpu_switch would do; otherwise just
  * take this as notification that the process has a new pmap.
  */
-void 
+void
 pmap_activate(struct lwp *l)
 {
 	pmap_t pmap = l->l_proc->p_vmspace->vm_map.pmap;
@@ -2787,7 +2787,7 @@ pmap_activate(struct lwp *l)
 /*
  * Deactivate the address space of the specified process.
  */
-void 
+void
 pmap_deactivate(struct lwp *l)
 {
 	/* Nothing to do. */
@@ -2800,7 +2800,7 @@ pmap_deactivate(struct lwp *l)
  *	In/out conditions:
  *			The mapping must already exist in the pmap.
  */
-void 
+void
 pmap_unwire(pmap_t pmap, vaddr_t va)
 {
 	int s, sme;
@@ -2857,7 +2857,7 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vaddr_t dst_addr, vsize_t len,
  *		with the given map/virtual_address pair.
  *	Returns zero if VA not valid.
  */
-bool 
+bool
 pmap_extract(pmap_t pmap, vaddr_t va, paddr_t *pap)
 {
 	int s, sme, segnum, ptenum, pte;
@@ -2904,7 +2904,7 @@ pmap_extract(pmap_t pmap, vaddr_t va, paddr_t *pap)
  *
  *	  Lower the permission for all mappings to a given page.
  */
-void 
+void
 pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
 {
 	paddr_t pa = VM_PAGE_TO_PHYS(pg);
@@ -2934,7 +2934,7 @@ pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
  * Initialize a preallocated and zeroed pmap structure,
  * such as one in a vmspace structure.
  */
-void 
+void
 pmap_pinit(pmap_t pmap)
 {
 	pmap_common_init(pmap);
@@ -2946,7 +2946,7 @@ pmap_pinit(pmap_t pmap)
  *	range of this map as requested.
  *	(Make pages read-only.)
  */
-void 
+void
 pmap_protect(pmap_t pmap, vaddr_t sva, vaddr_t eva, vm_prot_t prot)
 {
 	vaddr_t va, neva;
@@ -2989,7 +2989,7 @@ pmap_protect(pmap_t pmap, vaddr_t sva, vaddr_t eva, vm_prot_t prot)
  * (guaranteed to be within one segment)
  * similar to pmap_remove1()
  */
-void 
+void
 pmap_protect1(pmap_t pmap, vaddr_t sva, vaddr_t eva)
 {
 	int old_ctx, s, sme;
@@ -3041,7 +3041,7 @@ out:
  * where that PMEG is currently in the MMU.
  * The current context is already correct.
  */
-void 
+void
 pmap_protect_mmu(pmap_t pmap, vaddr_t sva, vaddr_t eva)
 {
 	pmeg_t pmegp;
@@ -3127,7 +3127,7 @@ pmap_protect_mmu(pmap_t pmap, vaddr_t sva, vaddr_t eva)
  * Remove write permissions, all in one PMEG,
  * where it is not currently in any context.
  */
-void 
+void
 pmap_protect_noctx(pmap_t pmap, vaddr_t sva, vaddr_t eva)
 {
 	int old_ctx, pte, sme, segnum;
@@ -3183,7 +3183,7 @@ pmap_protect_noctx(pmap_t pmap, vaddr_t sva, vaddr_t eva)
  *	It is assumed that the start and end are properly
  *	rounded to the page size.
  */
-void 
+void
 pmap_remove(pmap_t pmap, vaddr_t sva, vaddr_t eva)
 {
 	vaddr_t va, neva;
@@ -3195,7 +3195,7 @@ pmap_remove(pmap_t pmap, vaddr_t sva, vaddr_t eva)
 		printf("pmap_remove(%p, 0x%lx, 0x%lx)\n", pmap, sva, eva);
 #endif
 
-	
+
 	KASSERT((pmap == kernel_pmap) ?
 		sva >= virtual_avail && eva < DVMA_MAP_END :
 		eva <= VM_MAXUSER_ADDRESS);
@@ -3215,7 +3215,7 @@ pmap_remove(pmap_t pmap, vaddr_t sva, vaddr_t eva)
 /*
  * Remove user mappings, all within one segment
  */
-void 
+void
 pmap_remove1(pmap_t pmap, vaddr_t sva, vaddr_t eva)
 {
 	int old_ctx, s, sme;
@@ -3268,7 +3268,7 @@ out:
  * The current context is already correct.
  * If no PTEs remain valid in the PMEG, free it.
  */
-void 
+void
 pmap_remove_mmu(pmap_t pmap, vaddr_t sva, vaddr_t eva)
 {
 	pmeg_t pmegp;
@@ -3399,7 +3399,7 @@ pmap_remove_mmu(pmap_t pmap, vaddr_t sva, vaddr_t eva)
  * Remove some mappings, all in one PMEG,
  * where it is not currently in any context.
  */
-void 
+void
 pmap_remove_noctx(pmap_t pmap, vaddr_t sva, vaddr_t eva)
 {
 	pmeg_t pmegp;
@@ -3484,7 +3484,7 @@ pmap_remove_noctx(pmap_t pmap, vaddr_t sva, vaddr_t eva)
  * Count resident pages in this pmap.
  * See: kern_sysctl.c:pmap_resident_count
  */
-segsz_t 
+segsz_t
 pmap_resident_pages(pmap_t pmap)
 {
 	int i, sme, pages;
@@ -3508,7 +3508,7 @@ pmap_resident_pages(pmap_t pmap)
  * Count wired pages in this pmap.
  * See vm_mmap.c:pmap_wired_count
  */
-segsz_t 
+segsz_t
 pmap_wired_pages(pmap_t pmap)
 {
 	int i, mask, sme, pages;
@@ -3540,7 +3540,7 @@ pmap_wired_pages(pmap_t pmap)
  *	bcopy to copy the page, one machine dependent page at a
  *	time.
  */
-void 
+void
 pmap_copy_page(paddr_t src, paddr_t dst)
 {
 	int pte;
@@ -3582,7 +3582,7 @@ pmap_copy_page(paddr_t src, paddr_t dst)
  *	bzero to clear its contents, one machine dependent page
  *	at a time.
  */
-void 
+void
 pmap_zero_page(paddr_t pa)
 {
 	int pte;
@@ -3620,7 +3620,7 @@ pmap_zero_page(paddr_t pa)
  * least likely to cause cache aliases.
  * (This will just seg-align mappings.)
  */
-void 
+void
 pmap_prefer(vaddr_t fo, vaddr_t *va, int td)
 {
 	long d;
@@ -3640,7 +3640,7 @@ pmap_prefer(vaddr_t fo, vaddr_t *va, int td)
  * Fill in the sun3x-specific part of the kernel core header
  * for dumpsys().  (See machdep.c for the rest.)
  */
-void 
+void
 pmap_kcore_hdr(struct sun3_kcore_hdr *sh)
 {
 	vaddr_t va;
@@ -3665,7 +3665,7 @@ pmap_kcore_hdr(struct sun3_kcore_hdr *sh)
  * Copy the pagemap RAM into the passed buffer (one page)
  * starting at OFF in the pagemap RAM.
  */
-void 
+void
 pmap_get_pagemap(int *pt, int off)
 {
 	vaddr_t va, va_end;
@@ -3748,11 +3748,11 @@ set_pte_pmeg(int pmeg_num, int page_num, int pte)
 
 /*
  *	Routine:        pmap_procwr
- * 
+ *
  *	Function:
  *		Synchronize caches corresponding to [addr, addr+len) in p.
- */   
-void 
+ */
+void
 pmap_procwr(struct proc *p, vaddr_t va, size_t len)
 {
 	(void)cachectl1(0x80000004, va, len, p);
@@ -3762,7 +3762,7 @@ pmap_procwr(struct proc *p, vaddr_t va, size_t len)
 #ifdef	PMAP_DEBUG
 /* Things to call from the debugger. */
 
-void 
+void
 pmap_print(pmap_t pmap)
 {
 	db_printf(" pm_ctxnum=%d\n", pmap->pm_ctxnum);
@@ -3770,7 +3770,7 @@ pmap_print(pmap_t pmap)
 	db_printf(" pm_segmap=%p\n", pmap->pm_segmap);
 }
 
-void 
+void
 pmeg_print(pmeg_t pmegp)
 {
 	db_printf("link_next=%p  link_prev=%p\n",
@@ -3784,7 +3784,7 @@ pmeg_print(pmeg_t pmegp)
 		  pmegp->pmeg_qstate);
 }
 
-void 
+void
 pv_print(paddr_t pa)
 {
 	pv_entry_t pv;
diff --git a/sys/arch/sun3/sun3/sunmon.c b/sys/arch/sun3/sun3/sunmon.c
index a9967a6f2db6..0030a25470aa 100644
--- a/sys/arch/sun3/sun3/sunmon.c
+++ b/sys/arch/sun3/sun3/sunmon.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sunmon.c,v 1.19 2008/04/28 20:23:38 martin Exp $	*/
+/*	$NetBSD: sunmon.c,v 1.20 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunmon.c,v 1.19 2008/04/28 20:23:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunmon.c,v 1.20 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -87,7 +87,7 @@ _mode_kernel(void)
  * also put our hardware state back into place after
  * the PROM "c" (continue) command is given.
  */
-void 
+void
 sunmon_abort(void)
 {
 	int s = splhigh();
@@ -118,7 +118,7 @@ sunmon_abort(void)
 	splx(s);
 }
 
-void 
+void
 sunmon_halt(void)
 {
 	(void) splhigh();
@@ -140,7 +140,7 @@ sunmon_halt(void)
 /*
  * Caller must pass a string that is in our data segment.
  */
-void 
+void
 sunmon_reboot(const char *bs)
 {
 
@@ -168,7 +168,7 @@ struct funcall_frame {
 	int fr_arg[1];
 };
 /*VARARGS0*/
-static void 
+static void
 tracedump(int x1)
 {
 	struct funcall_frame *fp = (struct funcall_frame *)(&x1 - 2);
@@ -194,7 +194,7 @@ tracedump(int x1)
  * commands and a printf hack.
  * [lifted from freed cmu mach3 sun3 port]
  */
-static void 
+static void
 v_handler(int addr, char *str)
 {
 
@@ -255,7 +255,7 @@ v_handler(int addr, char *str)
  * argv[1] = options	(i.e. "-ds" or NULL)
  * argv[2] = NULL
  */
-void 
+void
 sunmon_init(void)
 {
 	struct sunromvec *rvec;
diff --git a/sys/arch/sun3/sun3/sys_machdep.c b/sys/arch/sun3/sun3/sys_machdep.c
index 39a9aa9ccfa7..771304da986b 100644
--- a/sys/arch/sun3/sun3/sys_machdep.c
+++ b/sys/arch/sun3/sun3/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.21 2007/12/20 23:02:43 dsl Exp $	*/
+/*	$NetBSD: sys_machdep.c,v 1.22 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.21 2007/12/20 23:02:43 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.22 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.21 2007/12/20 23:02:43 dsl Exp $")
 /* XXX end should be */
 
 /*ARGSUSED1*/
-int 
+int
 cachectl1(unsigned long req, vaddr_t addr, size_t len, struct proc *p)
 {
 	int error = 0;
@@ -86,7 +86,7 @@ cachectl1(unsigned long req, vaddr_t addr, size_t len, struct proc *p)
 	return(error);
 }
 
-int 
+int
 sys_sysarch(struct lwp *l, const struct sys_sysarch_args *uap, register_t *retval)
 {
 	/* {
diff --git a/sys/arch/sun3/sun3/trap.c b/sys/arch/sun3/sun3/trap.c
index 36afcbb5be62..db1f4e24c342 100644
--- a/sys/arch/sun3/sun3/trap.c
+++ b/sys/arch/sun3/sun3/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.142 2012/02/19 21:06:32 rmind Exp $	*/
+/*	$NetBSD: trap.c,v 1.143 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.142 2012/02/19 21:06:32 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.143 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
@@ -182,7 +182,7 @@ short	exframesize[] = {
 	FMT2SIZE,	/* type 2 - normal 6-word (68020/030/040/060) */
 	FMT3SIZE,	/* type 3 - FP post-instruction (68040/060) */
 	FMT4SIZE,	/* type 4 - access error/fp disabled (68060) */
-	-1, -1, 	/* type 5-6 - undefined */
+	-1, -1,		/* type 5-6 - undefined */
 	FMT7SIZE,	/* type 7 - access error (68040) */
 	58,		/* type 8 - bus fault (68010) */
 	FMT9SIZE,	/* type 9 - coprocessor mid-instruction (68020/030) */
@@ -204,14 +204,14 @@ int mmupid = -1;
 #define MDB_FOLLOW	1
 #define MDB_WBFOLLOW	2
 #define MDB_WBFAILED	4
-#define MDB_CPFAULT 	8
+#define MDB_CPFAULT	8
 #endif
 
 /*
  * trap and syscall both need the following work done before
  * returning to user mode.
  */
-static void 
+static void
 userret(struct lwp *l, struct trapframe *tf, u_quad_t oticks)
 {
 	struct proc *p = l->l_proc;
@@ -235,7 +235,7 @@ userret(struct lwp *l, struct trapframe *tf, u_quad_t oticks)
  */
 void machine_userret(struct lwp *, struct frame *, u_quad_t);
 
-void 
+void
 machine_userret(struct lwp *l, struct frame *f, u_quad_t t)
 {
 
@@ -248,7 +248,7 @@ machine_userret(struct lwp *l, struct frame *f, u_quad_t t)
  * System calls are broken out for efficiency.
  */
 /*ARGSUSED*/
-void 
+void
 trap(struct trapframe *tf, int type, u_int code, u_int v)
 {
 	struct lwp *l;
@@ -496,7 +496,7 @@ trap(struct trapframe *tf, int type, u_int code, u_int v)
 		}
 		/*FALLTHROUGH*/
 
-	case T_MMUFLT|T_USER: { 	/* page fault */
+	case T_MMUFLT|T_USER: {		/* page fault */
 		vaddr_t va;
 		struct vmspace *vm = p->p_vmspace;
 		struct vm_map *map;
@@ -511,8 +511,8 @@ trap(struct trapframe *tf, int type, u_int code, u_int v)
 
 		/*
 		 * It is only a kernel address space fault iff:
-		 * 	1. (type & T_USER) == 0  and: (2 or 3)
-		 * 	2. pcb_onfault not set or
+		 *	1. (type & T_USER) == 0  and: (2 or 3)
+		 *	2. pcb_onfault not set or
 		 *	3. pcb_onfault set but supervisor space data fault
 		 * The last can occur during an exec() copyin where the
 		 * argument space is lazy-allocated.
@@ -623,7 +623,7 @@ done:;
  * when there is no debugger installed (or not attached).
  * Drop into the PROM temporarily...
  */
-int 
+int
 _nodb_trap(int type, struct trapframe *tf)
 {
 
@@ -649,7 +649,7 @@ _nodb_trap(int type, struct trapframe *tf)
  * If we have both DDB and KGDB, let KGDB see it first,
  * because KGDB will just return 0 if not connected.
  */
-void 
+void
 trap_kdebug(int type, struct trapframe tf)
 {
 
@@ -672,7 +672,7 @@ trap_kdebug(int type, struct trapframe tf)
  * Called by locore.s for an unexpected interrupt.
  * XXX - Almost identical to trap_kdebug...
  */
-void 
+void
 straytrap(struct trapframe tf)
 {
 	int type = -1;
diff --git a/sys/arch/sun3/sun3/vme.c b/sys/arch/sun3/sun3/vme.c
index 82cad8465fc0..17c7bbf8c85d 100644
--- a/sys/arch/sun3/sun3/vme.c
+++ b/sys/arch/sun3/sun3/vme.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vme.c,v 1.21 2008/06/28 12:13:38 tsutsui Exp $	*/
+/*	$NetBSD: vme.c,v 1.22 2013/09/07 15:56:11 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.21 2008/06/28 12:13:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.22 2013/09/07 15:56:11 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -105,7 +105,7 @@ static struct sun68k_bus_space_tag vme_space_tag = {
 
 static struct sun68k_bus_dma_tag vme_dma_tag;
 
-static int 
+static int
 vme_match(device_t parent, cfdata_t cf, void *aux)
 {
 	struct confargs *ca = aux;
@@ -124,7 +124,7 @@ vme_match(device_t parent, cfdata_t cf, void *aux)
 	return 1;
 }
 
-static void 
+static void
 vme_attach(device_t parent, device_t self, void *aux)
 {
 	struct confargs *ca = aux;