diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2007-06-20 17:29:37 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2007-06-20 17:29:37 +0000 |
commit | eb665c5ca5fbea0bffcae85a3186d4fa212e3950 (patch) | |
tree | 640d10bab9da04b14672894700fa4345b3ba5213 /sys/arch/powerpc | |
parent | 98769c6ed17b76aa17508f5c952d51e63c956c96 (diff) |
In vunmapbuf(), explicitely remove mappings before invoking uvm_km_free().
Even if the latter would end up removing the mappings by itself, it would
do so using pmap_remove() because phys_map is not intrsafe; but some
platforms use pmap_kenter_pa() in vmapbuf(). By removing the mappings
ourselves, we can ensure the remove function used matches the enter function
which has been used.
Discussed and theoretical ok art@
Diffstat (limited to 'sys/arch/powerpc')
-rw-r--r-- | sys/arch/powerpc/powerpc/vm_machdep.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/powerpc/powerpc/vm_machdep.c b/sys/arch/powerpc/powerpc/vm_machdep.c index 41f91463e8c..5a7d92622de 100644 --- a/sys/arch/powerpc/powerpc/vm_machdep.c +++ b/sys/arch/powerpc/powerpc/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.43 2007/05/27 20:59:26 miod Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.44 2007/06/20 17:29:36 miod Exp $ */ /* $NetBSD: vm_machdep.c,v 1.1 1996/09/30 16:34:57 ws Exp $ */ /* @@ -223,7 +223,7 @@ vmapbuf(struct buf *bp, vsize_t len) faddr += NBPG; taddr += NBPG; } - pmap_update(pmap_kernel()); + pmap_update(vm_map_pmap(phys_map)); } /* @@ -241,6 +241,8 @@ vunmapbuf(struct buf *bp, vsize_t len) addr = trunc_page((vaddr_t)bp->b_data); off = (vaddr_t)bp->b_data - addr; len = round_page(off + len); + pmap_remove(vm_map_pmap(phys_map), addr, addr + len); + pmap_update(vm_map_pmap(phys_map)); uvm_km_free_wakeup(phys_map, addr, len); bp->b_data = bp->b_saveaddr; bp->b_saveaddr = 0; |