- _bus_dmamap_load_buffer_direct_common -> _bus_dmamap_load_buffer_direct

- fix _bus_dmamap_load_(uio/mbuf)_direct panic messages.
- s/vm_page_alloc_memory/uvm_pglistalloc/ in panic message.

From NetBSD

1 files changed, 10 insertions, 9 deletions

diff --git a/sys/arch/alpha/dev/bus_dma.c b/sys/arch/alpha/dev/bus_dma.c
index 2daa06cc4b0..989d3b6ddf6 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.19 2006/05/21 01:48:35 brad Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.20 2006/05/21 02:00:08 brad Exp $ */
 /* $NetBSD: bus_dma.c,v 1.40 2000/07/17 04:47:56 thorpej Exp $ */
 
 /*-
@@ -52,7 +52,7 @@
 #include <machine/bus.h>
 #include <machine/intr.h>
 
-int	_bus_dmamap_load_buffer_direct_common(bus_dma_tag_t,
+int	_bus_dmamap_load_buffer_direct(bus_dma_tag_t,
 	    bus_dmamap_t, void *, bus_size_t, struct proc *, int,
 	    paddr_t *, int *, int);
 
@@ -132,7 +132,7 @@ _bus_dmamap_destroy(t, map)
  * first indicates if this is the first invocation of this function.
  */
 int
-_bus_dmamap_load_buffer_direct_common(t, map, buf, buflen, p, flags,
+_bus_dmamap_load_buffer_direct(t, map, buf, buflen, p, flags,
     lastaddrp, segp, first)
 	bus_dma_tag_t t;
 	bus_dmamap_t map;
@@ -264,7 +264,7 @@ _bus_dmamap_load_direct(t, map, buf, buflen, p, flags)
 		return (EINVAL);
 
 	seg = 0;
-	error = _bus_dmamap_load_buffer_direct_common(t, map, buf, buflen,
+	error = _bus_dmamap_load_buffer_direct(t, map, buf, buflen,
 	    p, flags, &lastaddr, &seg, 1);
 	if (error == 0) {
 		map->dm_mapsize = buflen;
@@ -302,7 +302,7 @@ _bus_dmamap_load_mbuf_direct(t, map, m0, flags)
 
 #ifdef DIAGNOSTIC
 	if ((m0->m_flags & M_PKTHDR) == 0)
-		panic("_bus_dmamap_load_mbuf_direct_common: no packet header");
+		panic("_bus_dmamap_load_mbuf_direct: no packet header");
 #endif
 
 	if (m0->m_pkthdr.len > map->_dm_size)
@@ -314,7 +314,7 @@ _bus_dmamap_load_mbuf_direct(t, map, m0, flags)
 	for (m = m0; m != NULL && error == 0; m = m->m_next) {
 		if (m->m_len == 0)
 			continue;
-		error = _bus_dmamap_load_buffer_direct_common(t, map,
+		error = _bus_dmamap_load_buffer_direct(t, map,
 		    m->m_data, m->m_len, NULL, flags, &lastaddr, &seg, first);
 		first = 0;
 	}
@@ -361,7 +361,8 @@ _bus_dmamap_load_uio_direct(t, map, uio, flags)
 		p = uio->uio_procp;
 #ifdef DIAGNOSTIC
 		if (p == NULL)
-			panic("_bus_dmamap_load_direct_common: USERSPACE but no proc");
+			panic("_bus_dmamap_load_uio_direct: "
+			    "USERSPACE but no proc");
 #endif
 	}
 
@@ -376,7 +377,7 @@ _bus_dmamap_load_uio_direct(t, map, uio, flags)
 		minlen = resid < iov[i].iov_len ? resid : iov[i].iov_len;
 		addr = (caddr_t)iov[i].iov_base;
 
-		error = _bus_dmamap_load_buffer_direct_common(t, map,
+		error = _bus_dmamap_load_buffer_direct(t, map,
 		    addr, minlen, p, flags, &lastaddr, &seg, first);
 		first = 0;
 
@@ -514,7 +515,7 @@ _bus_dmamem_alloc_range(t, size, alignment, boundary, segs, nsegs, rsegs,
 		curaddr = VM_PAGE_TO_PHYS(m);
 #ifdef DIAGNOSTIC
 		if (curaddr < avail_start || curaddr >= high) {
-			printf("vm_page_alloc_memory returned non-sensical"
+			printf("uvm_pglistalloc returned non-sensical"
 			    " address 0x%lx\n", curaddr);
 			panic("_bus_dmamem_alloc");
 		}