summaryrefslogtreecommitdiff
path: root/sys/arch/sparc
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2010-06-22 20:27:33 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2010-06-22 20:27:33 +0000
commit41b0f020938fe9813afbe8c61237f6e1e88e2fbe (patch)
treebbdc05753bc1ba326da73d94de2f84b9bf27c6cd /sys/arch/sparc
parent7beea59d5aed960f07bc0db7e55e497817628aef (diff)
When mapping memory into dvma space, use pmap_kenter_pa() instead of
pmap_enter(), according to the XXX comment right above. Removes another un-CANFAILed pmap_enter. ok miod@
Diffstat (limited to 'sys/arch/sparc')
-rw-r--r--sys/arch/sparc/sparc/vm_machdep.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/sparc/sparc/vm_machdep.c b/sys/arch/sparc/sparc/vm_machdep.c
index 8f72d010786..7c3f8617c94 100644
--- a/sys/arch/sparc/sparc/vm_machdep.c
+++ b/sys/arch/sparc/sparc/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.51 2007/11/28 16:33:20 martin Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.52 2010/06/22 20:27:32 oga Exp $ */
/* $NetBSD: vm_machdep.c,v 1.30 1997/03/10 23:55:40 pk Exp $ */
/*
@@ -203,9 +203,8 @@ dvma_mapin_space(map, va, len, canwait, space)
pa |= PG_IOC;
#endif
#endif
- /* XXX - this should probably be pmap_kenter */
- 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);
}
tva += PAGE_SIZE;
@@ -244,7 +243,7 @@ dvma_mapout(kva, va, len)
else
#endif
{
- pmap_remove(pmap_kernel(), kva, kva + klen);
+ pmap_kremove(kva, klen);
pmap_update(pmap_kernel());
}