summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/alpha/dev/bus_dma.c8
-rw-r--r--sys/arch/amd64/amd64/bus_dma.c8
-rw-r--r--sys/arch/arm/arm/bus_dma.c8
-rw-r--r--sys/arch/aviion/aviion/bus_dma.c8
-rw-r--r--sys/arch/i386/i386/bus_dma.c10
-rw-r--r--sys/arch/loongson/loongson/bus_dma.c8
-rw-r--r--sys/arch/macppc/macppc/dma.c8
-rw-r--r--sys/arch/mvme68k/mvme68k/bus_dma.c8
-rw-r--r--sys/arch/mvme88k/mvme88k/bus_dma.c8
-rw-r--r--sys/arch/mvmeppc/mvmeppc/bus_dma.c8
-rw-r--r--sys/arch/octeon/octeon/bus_dma.c8
-rw-r--r--sys/arch/sgi/sgi/bus_dma.c8
-rw-r--r--sys/arch/socppc/socppc/dma.c8
-rw-r--r--sys/arch/sparc64/sparc64/machdep.c8
-rw-r--r--sys/arch/vax/vax/bus_dma.c8
15 files changed, 30 insertions, 92 deletions
diff --git a/sys/arch/alpha/dev/bus_dma.c b/sys/arch/alpha/dev/bus_dma.c
index 0ea8d8140f8..1b30fb7a5e4 100644
--- a/sys/arch/alpha/dev/bus_dma.c
+++ b/sys/arch/alpha/dev/bus_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_dma.c,v 1.30 2010/12/26 15:40:58 miod Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.31 2011/06/23 20:44:38 ariane Exp $ */
/* $NetBSD: bus_dma.c,v 1.40 2000/07/17 04:47:56 thorpej Exp $ */
/*-
@@ -614,12 +614,8 @@ _bus_dmamem_map(t, segs, nsegs, size, kvap, flags)
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);
}
}
diff --git a/sys/arch/amd64/amd64/bus_dma.c b/sys/arch/amd64/amd64/bus_dma.c
index 02b6cdd0df3..415c2063c20 100644
--- a/sys/arch/amd64/amd64/bus_dma.c
+++ b/sys/arch/amd64/amd64/bus_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_dma.c,v 1.36 2011/04/02 16:37:39 beck Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.37 2011/06/23 20:44:38 ariane Exp $ */
/* $NetBSD: bus_dma.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $ */
/*-
@@ -492,12 +492,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 (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);
}
}
diff --git a/sys/arch/arm/arm/bus_dma.c b/sys/arch/arm/arm/bus_dma.c
index 6c367ebc63d..479f2a1b835 100644
--- a/sys/arch/arm/arm/bus_dma.c
+++ b/sys/arch/arm/arm/bus_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_dma.c,v 1.20 2011/01/04 21:12:55 miod Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.21 2011/06/23 20:44:39 ariane Exp $ */
/* $NetBSD: bus_dma.c,v 1.38 2003/10/30 08:44:13 scw Exp $ */
/*-
@@ -718,12 +718,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 (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);
}
/*
diff --git a/sys/arch/aviion/aviion/bus_dma.c b/sys/arch/aviion/aviion/bus_dma.c
index f852f46df90..e6523c22818 100644
--- a/sys/arch/aviion/aviion/bus_dma.c
+++ b/sys/arch/aviion/aviion/bus_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_dma.c,v 1.3 2010/12/26 15:40:59 miod Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.4 2011/06/23 20:44:39 ariane Exp $ */
/* $NetBSD: bus_dma.c,v 1.2 2001/06/10 02:31:25 briggs Exp $ */
/*-
@@ -544,12 +544,8 @@ bus_dmamem_map(t, segs, nsegs, size, kvap, flags)
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);
}
}
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);
}
diff --git a/sys/arch/loongson/loongson/bus_dma.c b/sys/arch/loongson/loongson/bus_dma.c
index 6f8a3724c86..6f71881a9e5 100644
--- a/sys/arch/loongson/loongson/bus_dma.c
+++ b/sys/arch/loongson/loongson/bus_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_dma.c,v 1.6 2010/12/26 15:40:59 miod Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.7 2011/06/23 20:44:39 ariane Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -466,12 +466,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);
}
diff --git a/sys/arch/macppc/macppc/dma.c b/sys/arch/macppc/macppc/dma.c
index 3c56620a0b1..a4bace9b260 100644
--- a/sys/arch/macppc/macppc/dma.c
+++ b/sys/arch/macppc/macppc/dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dma.c,v 1.34 2010/12/26 15:40:59 miod Exp $ */
+/* $OpenBSD: dma.c,v 1.35 2011/06/23 20:44:39 ariane Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -483,12 +483,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);
}
}
diff --git a/sys/arch/mvme68k/mvme68k/bus_dma.c b/sys/arch/mvme68k/mvme68k/bus_dma.c
index c556f77ddbf..b458ad0c797 100644
--- a/sys/arch/mvme68k/mvme68k/bus_dma.c
+++ b/sys/arch/mvme68k/mvme68k/bus_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_dma.c,v 1.8 2010/12/26 15:40:59 miod Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.9 2011/06/23 20:44:39 ariane Exp $ */
/* $NetBSD: bus_dma.c,v 1.2 2001/06/10 02:31:25 briggs Exp $ */
/*-
@@ -541,12 +541,8 @@ bus_dmamem_map(t, segs, nsegs, size, kvap, flags)
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);
}
}
diff --git a/sys/arch/mvme88k/mvme88k/bus_dma.c b/sys/arch/mvme88k/mvme88k/bus_dma.c
index b08e5e59f73..695619bc6c6 100644
--- a/sys/arch/mvme88k/mvme88k/bus_dma.c
+++ b/sys/arch/mvme88k/mvme88k/bus_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_dma.c,v 1.16 2010/12/26 15:40:59 miod Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.17 2011/06/23 20:44:39 ariane Exp $ */
/* $NetBSD: bus_dma.c,v 1.2 2001/06/10 02:31:25 briggs Exp $ */
/*-
@@ -544,12 +544,8 @@ bus_dmamem_map(t, segs, nsegs, size, kvap, flags)
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);
}
}
diff --git a/sys/arch/mvmeppc/mvmeppc/bus_dma.c b/sys/arch/mvmeppc/mvmeppc/bus_dma.c
index 839b4c2515c..c4f66441c54 100644
--- a/sys/arch/mvmeppc/mvmeppc/bus_dma.c
+++ b/sys/arch/mvmeppc/mvmeppc/bus_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_dma.c,v 1.28 2010/12/26 15:40:59 miod Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.29 2011/06/23 20:44:39 ariane Exp $ */
/* $NetBSD: bus_dma.c,v 1.2 2001/06/10 02:31:25 briggs Exp $ */
/*-
@@ -512,12 +512,8 @@ _bus_dmamem_map(t, segs, nsegs, size, kvap, flags)
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);
}
}
diff --git a/sys/arch/octeon/octeon/bus_dma.c b/sys/arch/octeon/octeon/bus_dma.c
index fa3f5a95748..fb1be02b36f 100644
--- a/sys/arch/octeon/octeon/bus_dma.c
+++ b/sys/arch/octeon/octeon/bus_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_dma.c,v 1.2 2010/12/26 15:41:00 miod Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.3 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);
}
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);
}
diff --git a/sys/arch/socppc/socppc/dma.c b/sys/arch/socppc/socppc/dma.c
index 856d56cfbcf..4ede1757b6d 100644
--- a/sys/arch/socppc/socppc/dma.c
+++ b/sys/arch/socppc/socppc/dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dma.c,v 1.8 2010/12/26 15:41:00 miod Exp $ */
+/* $OpenBSD: dma.c,v 1.9 2011/06/23 20:44:39 ariane Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -483,12 +483,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);
}
}
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index f41fc4108aa..7eafe947e50 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.132 2011/06/05 19:41:08 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.133 2011/06/23 20:44:39 ariane Exp $ */
/* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
/*-
@@ -1494,12 +1494,8 @@ _bus_dmamem_map(t, t0, segs, nsegs, size, kvap, flags)
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);
}
va += PAGE_SIZE;
diff --git a/sys/arch/vax/vax/bus_dma.c b/sys/arch/vax/vax/bus_dma.c
index c2302f4278f..86c0488f2c3 100644
--- a/sys/arch/vax/vax/bus_dma.c
+++ b/sys/arch/vax/vax/bus_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_dma.c,v 1.26 2010/12/26 15:41:00 miod Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.27 2011/06/23 20:44:39 ariane Exp $ */
/* $NetBSD: bus_dma.c,v 1.5 1999/11/13 00:32:20 thorpej Exp $ */
/*-
@@ -469,12 +469,8 @@ _bus_dmamem_map(t, segs, nsegs, size, kvap, flags)
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);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 08:28:21 +0000