 @@ -1,14 +1,14 @@
-/*	$NetBSD: arm32_machdep.c,v 1.64 2009/03/14 15:36:01 dsl Exp $	*/
+/*	$NetBSD: arm32_machdep.c,v 1.65 2009/03/15 22:20:09 cegger Exp $	*/
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
+ *
  * This code is derived from software written for Brini by Mark Brinicombe
+ *
  * 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.
 @@ -32,27 +32,27 @@
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; 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.
+ *
  * Machine dependant functions for kernel setup
+ *
  * Created      : 17/09/94
  * Updated	: 18/04/01 updated for new wscons
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.64 2009/03/14 15:36:01 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.65 2009/03/15 22:20:09 cegger Exp $");
 #include "opt_md.h"
 #include "opt_pmap_debug.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
 @@ -149,27 +149,27 @@ arm32_vector_init(vaddr_t va, int which)
 		 * readable CPU control register, for now.  If we
 		 * ever encounter one that does not, we'll have to
 		 * rethink this.
 		 */
 		cpu_control(CPU_CONTROL_VECRELOC, CPU_CONTROL_VECRELOC);
+	}
+}
 /*
  * Debug function just to park the CPU
  */
 void
-halt()
+halt(void)
+{
 	while (1)
 		cpu_sleep(0);
+}
 /* Sync the discs and unmount the filesystems */
 void
 bootsync(void)
+{
 	static bool bootsyncdone = false;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.196 2009/03/09 08:42:36 nonaka Exp $	*/
+/*	$NetBSD: pmap.c,v 1.197 2009/03/15 22:20:10 cegger Exp $	*/
 /*
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Steve C. Woodford for Wasabi Systems, Inc.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -202,27 +202,27 @@
 #include <sys/pool.h>
 #include <sys/cdefs.h>
 #include <sys/cpu.h>
 #include <sys/sysctl.h>
 #include <uvm/uvm.h>
 #include <machine/bus.h>
 #include <machine/pmap.h>
 #include <machine/pcb.h>
 #include <machine/param.h>
 #include <arm/arm32/katelib.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.196 2009/03/09 08:42:36 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.197 2009/03/15 22:20:10 cegger Exp $");
 #ifdef PMAP_DEBUG
 /* XXX need to get rid of all refs to this */
 int pmap_debug_level = 0;
 /*
  * for switching to potentially finer grained debugging
  */
 #define	PDB_FOLLOW	0x0001
 #define	PDB_INIT	0x0002
 #define	PDB_ENTER	0x0004
 #define	PDB_REMOVE	0x0008
 @@ -6230,27 +6230,27 @@ pmap_uarea(vaddr_t va)
+			}
 			ptep++;
 			va += PAGE_SIZE;
+		}
 		PTE_SYNC_RANGE(sptep, (u_int)(ptep - sptep));
+	}
 	cpu_cpwait();
+}
 #endif /* ARM_MMU_XSCALE == 1 */
 /*
  * return the PA of the current L1 table, for use when handling a crash dump
  */
-uint32_t pmap_kernel_L1_addr()
+uint32_t pmap_kernel_L1_addr(void)
+{
 	return pmap_kernel()->pm_l1->l1_physaddr;
+}
 #if defined(DDB)
 /*
  * A couple of ddb-callable functions for dumping pmaps
  */
 void pmap_dump_all(void);
 void pmap_dump(pmap_t);
 void
 pmap_dump_all(void)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: stubs.c,v 1.20 2009/01/21 16:24:34 he Exp $	*/
+/*	$NetBSD: stubs.c,v 1.21 2009/03/15 22:20:10 cegger Exp $	*/
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
+ *
  * This code is derived from software written for Brini by Mark Brinicombe
+ *
  * 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.
 @@ -31,27 +31,27 @@
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; 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.
+ *
  * Routines that are temporary or do not have a home yet.
+ *
  * Created      : 17/09/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stubs.c,v 1.20 2009/01/21 16:24:34 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stubs.c,v 1.21 2009/03/15 22:20:10 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/msgbuf.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpu.h>
 #include <machine/intr.h>
 #include <machine/bootconfig.h>
 #include <machine/pcb.h>
 #include <arm/arm32/machdep.h>
 @@ -74,27 +74,27 @@ int 	dumpsize = 0;		/* pages */
 long	dumplo = 0; 		/* blocks */
 struct pcb dumppcb;
 /*
  * This is called by main to set dumplo and dumpsize.
  * Dumps always skip the first PAGE_SIZE of disk space
  * in case there might be a disk label stored there.
  * If there is extra space, put dump at the end to
  * reduce the chance that swapping trashes it.
  */
 void
-cpu_dumpconf()
+cpu_dumpconf(void)
+{
 	const struct bdevsw *bdev;
 	int nblks, dumpblks;	/* size of dump area */
 	if (dumpdev == NODEV)
 		return;
 	bdev = bdevsw_lookup(dumpdev);
 	if (bdev == NULL)
 		panic("dumpconf: bad dumpdev=0x%"PRIx64"", dumpdev);
 	if (bdev->d_psize == NULL)
 		return;
 	nblks = (*bdev->d_psize)(dumpdev);
 	if (nblks <= ctod(1))
 @@ -114,27 +114,27 @@ cpu_dumpconf()
 	/* dumpsize is in page units, and doesn't include headers. */
 	dumpsize = cpu_dump_mempagecnt();
 	return;
  bad:
 	dumpsize = 0;
+}
 /*
  * cpu_dump: dump the machine-dependent kernel core dump headers.
  */
 int
-cpu_dump()
+cpu_dump(void)
+{
 	int (*dump)(dev_t, daddr_t, void *, size_t);
 	char bf[dbtob(1)];
 	kcore_seg_t *segp;
 	cpu_kcore_hdr_t *cpuhdrp;
 	phys_ram_seg_t *memsegp;
 	const struct bdevsw *bdev;
 	int i;
 	bdev = bdevsw_lookup(dumpdev);
 	if (bdev == NULL)
 		return (ENXIO);
 	dump = bdev->d_dump;
 @@ -165,68 +165,68 @@ cpu_dump()
 	 */
 	for (i = 0; i < bootconfig.dramblocks; i++) {
 		memsegp[i].start = bootconfig.dram[i].address;
 		memsegp[i].size = bootconfig.dram[i].pages * PAGE_SIZE;
+	}
 	return (dump(dumpdev, dumplo, bf, dbtob(1)));
+}
 /*
  * cpu_dumpsize: calculate size of machine-dependent kernel core dump headers.
  */
 int
-cpu_dumpsize()
+cpu_dumpsize(void)
+{
 	int size;
 	size = ALIGN(sizeof(kcore_seg_t)) + ALIGN(sizeof(cpu_kcore_hdr_t)) +
 	    ALIGN( bootconfig.dramblocks * sizeof(phys_ram_seg_t));
 	if (roundup(size, dbtob(1)) != dbtob(1))
 		return (-1);
 	return (1);
+}
 /*
  * cpu_dump_mempagecnt: calculate the size of RAM (in pages) to be dumped.
  */
 u_long
-cpu_dump_mempagecnt()
+cpu_dump_mempagecnt(void)
+{
 	u_long i, n;
 	n = 0;
 	for (i = 0; i < bootconfig.dramblocks; i++) {
 		n += bootconfig.dram[i].pages;
+	}
 	return (n);
+}
 /* This should be moved to machdep.c */
 extern vaddr_t memhook;		/* XXX */
 /*
  * Doadump comes here after turning off memory management and
  * getting on the dump stack, either when called above, or by
  * the auto-restart code.
  */
 void dodumpsys(void);
 void
-dodumpsys()
+dodumpsys(void)
+{
 	const struct bdevsw *bdev;
 	daddr_t blkno;
 	int psize;
 	int error;
 	int addr;
 	int block;
 	int len;
 	vaddr_t dumpspace;
 	/* flush everything out of caches */
 	cpu_dcache_wbinv_all();