[src/netbsd-8]: src/sys/arch/arm/arm32 Pull up following revision(s) (request...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/07e67dc00107
branches:  netbsd-8
changeset: 434352:07e67dc00107
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Oct 24 09:12:07 2017 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #315):
        sys/arch/arm/arm32/vm_machdep.c: 1.71-1.72
In vmapbuf use pmap_enter(pmap_kernel(), ...) and not pmap_kenter_pa as the
former handles multiple mappings for VIPT AND VIVT correctly whereas the latter
doesn't work for VIVT. PR port-shark/52102
>From skrll@. Tested by martin@ and me.
--
Fix eva argument to pmap_remove and passed prot bits in flags for
pmap_enter, i.e. fix previous.

diffstat:

 sys/arch/arm/arm32/vm_machdep.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r e88d7bea0f2e -r 07e67dc00107 sys/arch/arm/arm32/vm_machdep.c
--- a/sys/arch/arm/arm32/vm_machdep.c   Tue Oct 24 09:08:40 2017 +0000
+++ b/sys/arch/arm/arm32/vm_machdep.c   Tue Oct 24 09:12:07 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm_machdep.c,v 1.70 2015/03/29 09:47:48 matt Exp $     */
+/*     $NetBSD: vm_machdep.c,v 1.70.10.1 2017/10/24 09:12:07 snj Exp $ */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.70 2015/03/29 09:47:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.70.10.1 2017/10/24 09:12:07 snj Exp $");
 
 #include "opt_armfpe.h"
 #include "opt_pmap_debug.h"
@@ -245,8 +245,8 @@
         */
        while (len) {
                (void) pmap_extract(pm, faddr, &fpa);
-               pmap_kenter_pa(taddr, fpa, VM_PROT_READ|VM_PROT_WRITE,
-                   PMAP_WIRED);
+               pmap_enter(pmap_kernel(), taddr, fpa, VM_PROT_READ|VM_PROT_WRITE,
+                   VM_PROT_READ|VM_PROT_WRITE|PMAP_WIRED);
                faddr += PAGE_SIZE;
                taddr += PAGE_SIZE;
                len -= PAGE_SIZE;
@@ -281,7 +281,7 @@
        off = (vaddr_t)bp->b_data - addr;
        len = round_page(off + len);
 
-       pmap_kremove(addr, len);
+       pmap_remove(pmap_kernel(), addr, addr + len);
        pmap_update(pmap_kernel());
        uvm_km_free(phys_map, addr, len, UVM_KMF_VAONLY);
        bp->b_data = bp->b_saveaddr;