[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

[zrouter-src-freebsd at zrouter.org]

details:   http://zrouter.org/hg/FreeBSD/head//rev/e53c8cf8072f
changeset: 395:e53c8cf8072f
user:      ray at terran.dlink.ua
date:      Fri Mar 02 17:15:27 2012 +0200
description:
Update to FreeBSD-HEAD @232391

diffstat:

 head/sys/sparc64/include/bus_dma.h     |  4 ++--
 head/sys/sparc64/sparc64/bus_machdep.c |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 3f34817ccfe8 -r e53c8cf8072f head/sys/sparc64/include/bus_dma.h
--- a/head/sys/sparc64/include/bus_dma.h	Fri Mar 02 17:15:20 2012 +0200
+++ b/head/sys/sparc64/include/bus_dma.h	Fri Mar 02 17:15:27 2012 +0200
@@ -62,7 +62,7 @@
  *	and
  *	from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/sparc64/include/bus_dma.h 232356 2012-03-01 19:58:34Z jhb $
  */
 
 #ifndef _SPARC64_BUS_DMA_H
@@ -103,7 +103,7 @@
 	void		*dt_cookie;		/* cookie used in the guts */
 	bus_dma_tag_t	dt_parent;
 	bus_size_t	dt_alignment;
-	bus_size_t	dt_boundary;
+	bus_addr_t	dt_boundary;
 	bus_addr_t	dt_lowaddr;
 	bus_addr_t	dt_highaddr;
 	bus_dma_filter_t	*dt_filter;
diff -r 3f34817ccfe8 -r e53c8cf8072f head/sys/sparc64/sparc64/bus_machdep.c
--- a/head/sys/sparc64/sparc64/bus_machdep.c	Fri Mar 02 17:15:20 2012 +0200
+++ b/head/sys/sparc64/sparc64/bus_machdep.c	Fri Mar 02 17:15:27 2012 +0200
@@ -92,7 +92,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/sparc64/sparc64/bus_machdep.c 225931 2011-10-02 23:22:38Z marius $");
+__FBSDID("$FreeBSD: head/sys/sparc64/sparc64/bus_machdep.c 232356 2012-03-01 19:58:34Z jhb $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -185,7 +185,7 @@
  */
 int
 bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
-    bus_size_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr,
+    bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr,
     bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize,
     int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
     void *lockfuncarg, bus_dma_tag_t *dmat)