 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.209 2013/11/10 18:27:15 christos Exp $	*/
+/*	$NetBSD: pmap.c,v 1.210 2014/04/23 20:57:15 skrll Exp $	*/
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and by Chris G. Demetriou.
+ *
  * 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
 @@ -57,27 +57,27 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (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.
+ *
  *	@(#)pmap.c	8.4 (Berkeley) 1/26/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.209 2013/11/10 18:27:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.210 2014/04/23 20:57:15 skrll Exp $");
 /*
  *	Manages physical address maps.
+ *
  *	In addition to hardware address maps, this
  *	module is called upon to provide software-use-only
  *	maps which may or may not be stored in the same
  *	form as hardware maps.  These pseudo-maps are
  *	used to store intermediate results from copy
  *	operations to and from address spaces.
+ *
  *	Since the information managed by this module is
  *	also stored by the logical address mapping module,
 @@ -444,36 +444,38 @@ pmap_map_ephemeral_page(struct vm_page *
+	}
 	return va;
+}
 static void
 pmap_unmap_ephemeral_page(struct vm_page *pg, vaddr_t va,
 	pt_entry_t old_pt_entry)
+{
 	struct vm_page_md * const md = VM_PAGE_TO_MD(pg);
 	pv_entry_t pv = &md->pvh_first;
 	(void)PG_MD_PVLIST_LOCK(md, false);
-	if (MIPS_CACHE_VIRTUAL_ALIAS
+	if (MIPS_CACHE_VIRTUAL_ALIAS) {
-	    && (PG_MD_UNCACHED_P(md)
+		if (PG_MD_CACHED_P(md)
-		|| (pv->pv_pmap != NULL
+		    || (pv->pv_pmap != NULL
-		    && mips_cache_badalias(pv->pv_va, va)))) {
+			&& mips_cache_badalias(pv->pv_va, va))) {
 		/*
-		 * If this page was previously uncached or we had to use an
+			/*
-		 * incompatible alias and it has a valid mapping, flush it
+			 * If this page was previously cached or we had to use an
-		 * from the cache.
+			 * incompatible alias and it has a valid mapping, flush it
-		 */
+			 * from the cache.
-		mips_dcache_wbinv_range(va, PAGE_SIZE);
+			 */
 			mips_dcache_wbinv_range(va, PAGE_SIZE);
+		}
+	}
 	PG_MD_PVLIST_UNLOCK(md);
 #ifndef _LP64
 	/*
 	 * If we had to map using a page table entry, unmap it now.
 	 */
 	if (va >= VM_MIN_KERNEL_ADDRESS) {
 		pmap_kremove(va, PAGE_SIZE);
 		if (mips_pg_v(old_pt_entry.pt_entry)) {
 			*kvtopte(va) = old_pt_entry;
 			pmap_tlb_update_addr(pmap_kernel(), va,
 			    old_pt_entry.pt_entry, false);
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vm_machdep.c,v 1.142 2012/02/19 21:06:20 rmind Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.143 2014/04/23 20:57:15 skrll Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department and Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -29,27 +29,27 @@
  * DAMAGES (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.
+ *
  * from: Utah Hdr: vm_machdep.c 1.21 91/04/06
+ *
  *	@(#)vm_machdep.c	8.3 (Berkeley) 1/4/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.142 2012/02/19 21:06:20 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.143 2014/04/23 20:57:15 skrll Exp $");
 #include "opt_ddb.h"
 #include "opt_coredump.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/cpu.h>
 #include <sys/vnode.h>
 #include <sys/core.h>
 #include <sys/exec.h>
 @@ -220,26 +220,31 @@ cpu_uarea_alloc(bool system)
 bool
 cpu_uarea_free(void *va)
+{
 #ifdef _LP64
 	if (!MIPS_XKPHYS_P(va))
 		return false;
 	paddr_t pa = MIPS_XKPHYS_TO_PHYS(va);
 #else
 	if (!MIPS_KSEG0_P(va))
 		return false;
 	paddr_t pa = MIPS_KSEG0_TO_PHYS(va);
 #endif
 #ifdef MIPS3_PLUS
 	if (MIPS_CACHE_VIRTUAL_ALIAS)
 		mips_dcache_inv_range((vaddr_t)va, USPACE);
 #endif
 	for (const paddr_t epa = pa + USPACE; pa < epa; pa += PAGE_SIZE) {
 		struct vm_page * const pg = PHYS_TO_VM_PAGE(pa);
 		KASSERT(pg != NULL);
 		uvm_pagefree(pg);
+	}
 	return true;
+}
 void
 cpu_lwp_free(struct lwp *l, int proc)
+{
 	(void)l;