Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace pmap_enter() with pmap_kenter_pa() where appropriate.

This commit is contained in:
chs 2001-09-11 20:37:12 +00:00
parent 97438fd6d4
commit 0f63dc99dc
4 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/sun3/sun3/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.151 2001/09/10 21:19:27 chris Exp $ */
/* $NetBSD: machdep.c,v 1.152 2001/09/11 20:37:12 chs Exp $ */
/*
* Copyright (c) 1994, 1995 Gordon W. Ross
@ -711,11 +711,10 @@ dumpsys()
do {
if ((todo & 0xf) == 0)
printf("\r%4d", todo);
pmap_enter(pmap_kernel(), vmmap, paddr | PMAP_NC,
VM_PROT_READ, VM_PROT_READ);
pmap_kenter_pa(vmmap, paddr | PMAP_NC, VM_PROT_READ);
pmap_update(pmap_kernel());
error = (*dsw->d_dump)(dumpdev, blkno, vaddr, NBPG);
pmap_remove(pmap_kernel(), vmmap, vmmap + NBPG);
pmap_kremove(vmmap, NBPG);
pmap_update(pmap_kernel());
if (error)
goto fail;

7
sys/arch/sun3/sun3x/bus_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus_subr.c,v 1.22 2001/09/10 21:19:28 chris Exp $ */
/* $NetBSD: bus_subr.c,v 1.23 2001/09/11 20:37:13 chs Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -107,8 +107,7 @@ bus_tmapin(bustype, pa)
tmp_vpages_inuse++;
pgva = tmp_vpages[1];
pmap_enter(pmap_kernel(), pgva, pa,
(VM_PROT_READ|VM_PROT_WRITE), PMAP_WIRED);
pmap_kenter_pa(pgva, pa, VM_PROT_READ | VM_PROT_WRITE);
pmap_update(pmap_kernel());
splx(s);
@ -126,7 +125,7 @@ void bus_tmapout(vp)
return;
s = splvm();
pmap_remove(pmap_kernel(), pgva, pgva + NBPG);
pmap_kremove(pgva, NBPG);
pmap_update(pmap_kernel());
--tmp_vpages_inuse;
splx(s);

17
sys/arch/sun3/sun3x/dvma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dvma.c,v 1.22 2001/09/10 21:19:28 chris Exp $ */
/* $NetBSD: dvma.c,v 1.23 2001/09/11 20:37:13 chs Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -238,8 +238,7 @@ dvma_mapin(kmem_va, len, canwait)
#endif /* DEBUG */
iommu_enter((tva & IOMMU_VA_MASK), pa);
pmap_enter(pmap_kernel(), tva, pa | PMAP_NC,
VM_PROT_READ|VM_PROT_WRITE, PMAP_WIRED);
pmap_kenter_pa(tva, pa | PMAP_NC, VM_PROT_READ | VM_PROT_WRITE);
}
pmap_update(pmap_kernel());
@ -267,18 +266,8 @@ dvma_mapout(dvma_addr, len)
len = round_page(len + off);
iommu_remove((kva & IOMMU_VA_MASK), len);
/*
* XXX - don't call pmap_remove() with DVMA space yet.
* XXX It cannot (currently) handle the removal
* XXX of address ranges which do not participate in the
* XXX PV system by virtue of their _virtual_ addresses.
* XXX DVMA is one of these special address spaces.
*/
#ifdef DVMA_ON_PVLIST
pmap_remove(pmap_kernel(), kva, kva + len);
pmap_kremove(kva, len);
pmap_update(pmap_kernel());
#endif /* DVMA_ON_PVLIST */
s = splvm();
rmfree(dvmamap, btoc(len), btoc(kva));

7
sys/arch/sun3/sun3x/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.75 2001/09/10 21:19:28 chris Exp $ */
/* $NetBSD: machdep.c,v 1.76 2001/09/11 20:37:13 chs Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -710,11 +710,10 @@ dumpsys()
printf("\r%4d", todo);
/* Make a temporary mapping for the page. */
pmap_enter(pmap_kernel(), vmmap, paddr | PMAP_NC,
VM_PROT_READ, 0);
pmap_kenter_pa(vmmap, paddr | PMAP_NC, VM_PROT_READ);
pmap_update(pmap_kernel());
error = (*dsw->d_dump)(dumpdev, blkno, vaddr, NBPG);
pmap_remove(pmap_kernel(), vmmap, vmmap + NBPG);
pmap_kremove(vmmap, NBPG);
pmap_update(pmap_kernel());
if (error)
goto fail;