diff options
| author | Ariane van der Steldt <ariane@cvs.openbsd.org> | 2011-06-23 20:44:40 +0000 |
|---|---|---|
| committer | Ariane van der Steldt <ariane@cvs.openbsd.org> | 2011-06-23 20:44:40 +0000 |
| commit | 0f28a042eb41d7327f657e3ee9d5b5ebb45b4ae9 (patch) | |
| tree | a61d9cd4563d488aa9cbe1e1373ba909d2215ccf /sys/arch/i386 | |
| parent | 7d92efd246de448e6fb91f652014db2db9853704 (diff) | |
Fix the error path in bus_dmamem_map.
As discussed on icb: remove the comment,
remove pmap_remove (uvm_km_free does that for us).
ok oga@, deraadt@
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/bus_dma.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/arch/i386/i386/bus_dma.c b/sys/arch/i386/i386/bus_dma.c index 6c0d4b3c201..5f1084f8a3e 100644 --- a/sys/arch/i386/i386/bus_dma.c +++ b/sys/arch/i386/i386/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.24 2010/12/26 15:40:59 miod Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.25 2011/06/23 20:44:39 ariane Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. * All rights reserved. @@ -456,14 +456,8 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs, VM_PROT_READ | VM_PROT_WRITE, VM_PROT_READ | VM_PROT_WRITE | PMAP_WIRED | PMAP_CANFAIL); if (ret) { - /* - * Clean up after ourselves. - * XXX uvm_wait on WAITOK - */ - pmap_remove(pmap_kernel(), sva, va - PAGE_SIZE); pmap_update(pmap_kernel()); - - uvm_km_free(kernel_map, va, ssize); + uvm_km_free(kernel_map, sva, ssize); return (ret); } |