Module Name: src
Committed By: skrll
Date: Sun Feb 2 08:16:40 UTC 2020
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Always pmap_kenter_pa the page in pmap_grow_map regardless of how we got
it.
To generate a diff of this commit:
cvs rdiff -u -r1.384 -r1.385 src/sys/arch/arm/arm32/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.384 src/sys/arch/arm/arm32/pmap.c:1.385
--- src/sys/arch/arm/arm32/pmap.c:1.384 Sun Feb 2 07:55:11 2020
+++ src/sys/arch/arm/arm32/pmap.c Sun Feb 2 08:16:40 2020
@@ -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 @@ pmap_grow_map(vaddr_t va, paddr_t *pap)
#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,10 +5828,11 @@ pmap_grow_map(vaddr_t va, paddr_t *pap)
*/
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;
