[src/trunk]: src/sys/arch/arm/arm32 Always pmap_kenter_pa the page in pmap_gr...

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

details:   https://anonhg.NetBSD.org/src/rev/64c6c9bc6e77
branches:  trunk
changeset: 744469:64c6c9bc6e77
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Feb 02 08:16:40 2020 +0000

description:
Always pmap_kenter_pa the page in pmap_grow_map regardless of how we got
it.

diffstat:

 sys/arch/arm/arm32/pmap.c |  14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (42 lines):

diff -r d80a9b943ee8 -r 64c6c9bc6e77 sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Sun Feb 02 07:59:41 2020 +0000
+++ b/sys/arch/arm/arm32/pmap.c Sun Feb 02 08:16:40 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.384 2020/02/02 07:55:11 skrll Exp $ */
+/*     $NetBSD: pmap.c,v 1.385 2020/02/02 08:16:40 skrll Exp $ */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -198,7 +198,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.384 2020/02/02 07:55:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.385 2020/02/02 08:16:40 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -5815,9 +5815,6 @@
 #else
                if (uvm_page_physget(&pa) == false)
                        return (1);
-
-               pmap_kenter_pa(va, pa,
-                   VM_PROT_READ|VM_PROT_WRITE, PMAP_KMPAGE|PMAP_PTE);
 #endif /* PMAP_STEAL_MEMORY */
        } else {
                struct vm_page *pg;
@@ -5831,9 +5828,10 @@
                 */
                struct vm_page_md *md __diagused = VM_PAGE_TO_MD(pg);
                KASSERT(SLIST_EMPTY(&md->pvh_list));
-               pmap_kenter_pa(va, pa,
-                   VM_PROT_READ|VM_PROT_WRITE, PMAP_KMPAGE|PMAP_PTE);
-       }
+       }
+
+       pmap_kenter_pa(va, pa,
+           VM_PROT_READ|VM_PROT_WRITE, PMAP_KMPAGE|PMAP_PTE);
 
        if (pap)
                *pap = pa;