 @@ -1,14 +1,14 @@
-/*	$NetBSD: vm_machdep.c,v 1.64 2012/12/18 06:30:18 matt Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.65 2013/01/25 13:17:39 skrll 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.
 @@ -34,27 +34,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * RiscBSD kernel project
+ *
  * vm_machdep.h
+ *
  * vm machine specific bits
+ *
  * Created      : 08/10/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.64 2012/12/18 06:30:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.65 2013/01/25 13:17:39 skrll Exp $");
 #include "opt_armfpe.h"
 #include "opt_pmap_debug.h"
 #include "opt_perfctrs.h"
 #include "opt_cputypes.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/cpu.h>
 #include <sys/buf.h>
 @@ -108,27 +108,27 @@ cpu_proc_fork(struct proc *p1, struct pr
  * accordingly.
  */
 void
 cpu_lwp_fork(struct lwp *l1, struct lwp *l2, void *stack, size_t stacksize,
     void (*func)(void *), void *arg)
+{
 	struct switchframe *sf;
 	vaddr_t uv;
 	const struct pcb * const pcb1 = lwp_getpcb(l1);
 	struct pcb * const pcb2 = lwp_getpcb(l2);
 #ifdef PMAP_DEBUG
-	if (pmap_debug_level >= 0)
+	if (pmap_debug_level > 0)
 		printf("cpu_lwp_fork: %p %p %p %p\n", l1, l2, curlwp, &lwp0);
 #endif	/* PMAP_DEBUG */
 	/* Copy the pcb */
 	*pcb2 = *pcb1;
 #ifdef FPU_VFP
 	/*
 	 * Disable the VFP for a newly created LWP but remember if the
 	 * VFP state is valid.
 	 */
 	pcb2->pcb_vfp.vfp_fpexc &= ~VFP_FPEXC_EN;
 	l2->l_md.md_flags = l1->l_md.md_flags & MDLWP_VFPUSED;
 @@ -138,27 +138,27 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
 	 * Set up the kernel stack for the process.
 	 * Note: this stack is not in use if we are forking from p1
 	 */
 	uv = uvm_lwp_getuarea(l2);
 	pcb2->pcb_ksp = uv + USPACE_SVC_STACK_TOP;
 #ifdef STACKCHECKS
 	/* Fill the kernel stack with a known pattern */
 	memset((void *)(uv + USPACE_SVC_STACK_BOTTOM), 0xdd,
 	    (USPACE_SVC_STACK_TOP - USPACE_SVC_STACK_BOTTOM));
 #endif	/* STACKCHECKS */
 #ifdef PMAP_DEBUG
-	if (pmap_debug_level >= 0) {
+	if (pmap_debug_level > 0) {
 		printf("l1: pcb=%p pid=%d pmap=%p\n",
 		    pcb1, l1->l_lid, l1->l_proc->p_vmspace->vm_map.pmap);
 		printf("l2: pcb=%p pid=%d pmap=%p\n",
 		    pcb2, l2->l_lid, l2->l_proc->p_vmspace->vm_map.pmap);
+	}
 #endif	/* PMAP_DEBUG */
 	struct trapframe *tf = (struct trapframe *)pcb2->pcb_ksp - 1;
 	lwp_settrapframe(l2, tf);
 	*tf = *lwp_trapframe(l1);
 	/*
 	 * If specified, give the child a different stack (make sure
 @@ -208,27 +208,27 @@ cpu_lwp_free2(struct lwp *l)
 /*
  * Map a user I/O request into kernel virtual address space.
  * Note: the pages are already locked by uvm_vslock(), so we
  * do not need to pass an access_type to pmap_enter().
  */
 int
 vmapbuf(struct buf *bp, vsize_t len)
+{
 	vaddr_t faddr, taddr, off;
 	paddr_t fpa;
 #ifdef PMAP_DEBUG
-	if (pmap_debug_level >= 0)
+	if (pmap_debug_level > 0)
 		printf("vmapbuf: bp=%08x buf=%08x len=%08x\n", (u_int)bp,
 		    (u_int)bp->b_data, (u_int)len);
 #endif	/* PMAP_DEBUG */
 	if ((bp->b_flags & B_PHYS) == 0)
 		panic("vmapbuf");
 	bp->b_saveaddr = bp->b_data;
 	faddr = trunc_page((vaddr_t)bp->b_data);
 	off = (vaddr_t)bp->b_data - faddr;
 	len = round_page(off + len);
 	taddr = uvm_km_alloc(phys_map, len, atop(faddr) & uvmexp.colormask,
 	    UVM_KMF_VAONLY | UVM_KMF_WAITVA | UVM_KMF_COLORMATCH);
 @@ -251,27 +251,27 @@ vmapbuf(struct buf *bp, vsize_t len)
 	return 0;
+}
 /*
  * Unmap a previously-mapped user I/O request.
  */
 void
 vunmapbuf(struct buf *bp, vsize_t len)
+{
 	vaddr_t addr, off;
 #ifdef PMAP_DEBUG
-	if (pmap_debug_level >= 0)
+	if (pmap_debug_level > 0)
 		printf("vunmapbuf: bp=%08x buf=%08x len=%08x\n",
 		    (u_int)bp, (u_int)bp->b_data, (u_int)len);
 #endif	/* PMAP_DEBUG */
 	if ((bp->b_flags & B_PHYS) == 0)
 		panic("vunmapbuf");
 	/*
 	 * Make sure the cache does not have dirty data for the
 	 * pages we had mapped.
 	 */
 	addr = trunc_page((vaddr_t)bp->b_data);
 	off = (vaddr_t)bp->b_data - addr;