 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.187 2008/09/28 21:27:11 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.187.4.1 2009/12/03 09:26:59 sborrill 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.187 2008/09/28 21:27:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.187.4.1 2009/12/03 09:26:59 sborrill 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
 @@ -3635,27 +3635,26 @@ pmap_icache_sync_range(pmap_t pm, vaddr_
 	pmap_release_pmap_lock(pm);
 	PMAP_MAP_TO_HEAD_UNLOCK();
+}
 void
 pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
+{
 	NPDEBUG(PDB_PROTECT,
 	    printf("pmap_page_protect: pg %p (0x%08lx), prot 0x%x\n",
 	    pg, VM_PAGE_TO_PHYS(pg), prot));
 	switch(prot) {
 		return;
 	case VM_PROT_READ|VM_PROT_WRITE:
 #if defined(PMAP_CHECK_VIPT) && defined(PMAP_APX)
 		pmap_clearbit(pg, PVF_EXEC);
 		break;
 #endif
 	case VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE:
 		break;
 	case VM_PROT_READ:
 #if defined(PMAP_CHECK_VIPT) && defined(PMAP_APX)
 		pmap_clearbit(pg, PVF_WRITE|PVF_EXEC);
 		break;
 #endif
 @@ -4066,33 +4065,52 @@ pmap_activate(struct lwp *l)
 	} else
 		opm = NULL;
 	PMAPCOUNT(activations);
 	block_userspace_access = 1;
 	/*
 	 * If switching to a user vmspace which is different to the
 	 * most recent one, and the most recent one is potentially
 	 * live in the cache, we must write-back and invalidate the
 	 * entire cache.
 	 */
 	rpm = pmap_recent_user;
 /*
  * XXXSCW: There's a corner case here which can leave turds in the cache as
  * reported in kern/41058. They're probably left over during tear-down and
  * switching away from an exiting process. Until the root cause is identified
  * and fixed, zap the cache when switching pmaps. This will result in a few
  * unnecessary cache flushes, but that's better than silently corrupting data.
  */
 #if 0
 	if (npm != pmap_kernel() && rpm && npm != rpm &&
 	    rpm->pm_cstate.cs_cache) {
 		rpm->pm_cstate.cs_cache = 0;
 #ifdef PMAP_CACHE_VIVT
 		cpu_idcache_wbinv_all();
 #endif
+	}
 #else
 	if (rpm) {
 		rpm->pm_cstate.cs_cache = 0;
 		if (npm == pmap_kernel())
 			pmap_recent_user = NULL;
 #ifdef PMAP_CACHE_VIVT
 		cpu_idcache_wbinv_all();
 #endif
+	}
 #endif
 	/* No interrupts while we frob the TTB/DACR */
 	oldirqstate = disable_interrupts(IF32_bits);
 	/*
 	 * For ARM_VECTORS_LOW, we MUST, I repeat, MUST fix up the L1
 	 * entry corresponding to 'vector_page' in the incoming L1 table
 	 * before switching to it otherwise subsequent interrupts/exceptions
 	 * (including domain faults!) will jump into hyperspace.
 	 */
 	if (npm->pm_pl1vec != NULL) {
 		cpu_tlb_flushID_SE((u_int)vector_page);
 		cpu_cpwait();