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/sgi | |
| 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/sgi')
| -rw-r--r-- | sys/arch/sgi/sgi/bus_dma.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/arch/sgi/sgi/bus_dma.c b/sys/arch/sgi/sgi/bus_dma.c index 8555822a9f9..35d877dcf47 100644 --- a/sys/arch/sgi/sgi/bus_dma.c +++ b/sys/arch/sgi/sgi/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.21 2011/04/03 22:33:55 miod Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.22 2011/06/23 20:44:39 ariane Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -471,12 +471,8 @@ _dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs, size_t size, VM_PROT_READ | VM_PROT_WRITE, VM_PROT_READ | VM_PROT_WRITE | PMAP_WIRED | PMAP_CANFAIL); if (error) { - /* - * Clean up after ourselves. - * XXX uvm_wait on WAITOK - */ pmap_update(pmap_kernel()); - uvm_km_free(kernel_map, va, ssize); + uvm_km_free(kernel_map, sva, ssize); return (error); } |