Module Name: src
Committed By: maxv
Date: Mon Sep 10 15:14:50 UTC 2018
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
src/sys/arch/aarch64/include: pmap.h
Log Message:
Rename _pmap_alloc_pdp -> pmap_alloc_pdp, and make it public.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/aarch64/include/pmap.h
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/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.21 src/sys/arch/aarch64/aarch64/pmap.c:1.22
--- src/sys/arch/aarch64/aarch64/pmap.c:1.21 Mon Sep 10 11:05:12 2018
+++ src/sys/arch/aarch64/aarch64/pmap.c Mon Sep 10 15:14:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.21 2018/09/10 11:05:12 ryo Exp $ */
+/* $NetBSD: pmap.c,v 1.22 2018/09/10 15:14:50 maxv Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.21 2018/09/10 11:05:12 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.22 2018/09/10 15:14:50 maxv Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -596,8 +596,8 @@ pmap_reference(struct pmap *pm)
atomic_inc_uint(&pm->pm_refcnt);
}
-static pd_entry_t *
-_pmap_alloc_pdp(struct pmap *pm, paddr_t *pap)
+pd_entry_t *
+pmap_alloc_pdp(struct pmap *pm, paddr_t *pap)
{
paddr_t pa;
@@ -1300,7 +1300,7 @@ pmap_create(void)
pm->pm_asid = -1;
SLIST_INIT(&pm->pm_vmlist);
mutex_init(&pm->pm_lock, MUTEX_DEFAULT, IPL_VM);
- pm->pm_l0table = _pmap_alloc_pdp(pm, &pm->pm_l0table_pa);
+ pm->pm_l0table = pmap_alloc_pdp(pm, &pm->pm_l0table_pa);
KASSERT(((vaddr_t)pm->pm_l0table & (PAGE_SIZE - 1)) == 0);
UVMHIST_LOG(pmaphist, "pm=%p, pm_l0table=%016lx, pm_l0table_pa=%016lx",
@@ -1420,7 +1420,7 @@ _pmap_enter(struct pmap *pm, vaddr_t va,
idx = l0pde_index(va);
pde = l0[idx];
if (!l0pde_valid(pde)) {
- _pmap_alloc_pdp(pm, &pdppa);
+ pmap_alloc_pdp(pm, &pdppa);
KASSERT(pdppa != POOL_PADDR_INVALID);
atomic_swap_64(&l0[idx], pdppa | L0_TABLE);
l3only = false;
@@ -1432,7 +1432,7 @@ _pmap_enter(struct pmap *pm, vaddr_t va,
idx = l1pde_index(va);
pde = l1[idx];
if (!l1pde_valid(pde)) {
- _pmap_alloc_pdp(pm, &pdppa);
+ pmap_alloc_pdp(pm, &pdppa);
KASSERT(pdppa != POOL_PADDR_INVALID);
atomic_swap_64(&l1[idx], pdppa | L1_TABLE);
l3only = false;
@@ -1444,7 +1444,7 @@ _pmap_enter(struct pmap *pm, vaddr_t va,
idx = l2pde_index(va);
pde = l2[idx];
if (!l2pde_valid(pde)) {
- _pmap_alloc_pdp(pm, &pdppa);
+ pmap_alloc_pdp(pm, &pdppa);
KASSERT(pdppa != POOL_PADDR_INVALID);
atomic_swap_64(&l2[idx], pdppa | L2_TABLE);
l3only = false;
Index: src/sys/arch/aarch64/include/pmap.h
diff -u src/sys/arch/aarch64/include/pmap.h:1.8 src/sys/arch/aarch64/include/pmap.h:1.9
--- src/sys/arch/aarch64/include/pmap.h:1.8 Fri Aug 10 21:06:42 2018
+++ src/sys/arch/aarch64/include/pmap.h Mon Sep 10 15:14:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.8 2018/08/10 21:06:42 ryo Exp $ */
+/* $NetBSD: pmap.h,v 1.9 2018/09/10 15:14:50 maxv Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -135,6 +135,8 @@ const struct pmap_devmap *pmap_devmap_fi
vaddr_t pmap_devmap_phystov(paddr_t);
paddr_t pmap_devmap_vtophys(paddr_t);
+pd_entry_t *pmap_alloc_pdp(struct pmap *, paddr_t *);
+
/* devmap use L2 blocks. (2Mbyte) */
#define DEVMAP_TRUNC_ADDR(x) ((x) & ~L2_OFFSET)
#define DEVMAP_ROUND_SIZE(x) (((x) + L2_SIZE - 1) & ~(L2_SIZE - 1))
