From 4d1b94700025ec4ebec9c0f1772886adfdb19b3c Mon Sep 17 00:00:00 2001
From: marius <marius@FreeBSD.org>
Date: Mon, 1 Feb 2010 10:18:00 +0000
Subject: [PATCH] Merge r177565 from sparc64:

- Const'ify the bus_stream_asi and bus_type_asi arrays.
- Replace hard-coded functions names missed in bus_machdep.c with __func__.
- Break some long lines.
---
 sys/sun4v/include/bus.h       |  4 ++--
 sys/sun4v/sun4v/bus_machdep.c | 23 +++++++++++------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/sys/sun4v/include/bus.h b/sys/sun4v/include/bus.h
index a1e3050f5576..2838859a9911 100644
--- a/sys/sun4v/include/bus.h
+++ b/sys/sun4v/include/bus.h
@@ -96,8 +96,8 @@
 #define	PCI_MEMORY_BUS_SPACE	4
 #define	LAST_BUS_SPACE		5
 
-extern int bus_type_asi[];
-extern int bus_stream_asi[];
+extern const int bus_type_asi[];
+extern const int bus_stream_asi[];
 
 #define __BUS_SPACE_HAS_STREAM_METHODS	1
 
diff --git a/sys/sun4v/sun4v/bus_machdep.c b/sys/sun4v/sun4v/bus_machdep.c
index 0c76feeaedf8..1282b0e79b9c 100644
--- a/sys/sun4v/sun4v/bus_machdep.c
+++ b/sys/sun4v/sun4v/bus_machdep.c
@@ -95,7 +95,7 @@
  *	from: @(#)machdep.c	8.6 (Berkeley) 1/14/94
  *	from: NetBSD: machdep.c,v 1.111 2001/09/15 07:13:40 eeh Exp
  *	and
- * 	from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.24 2001/08/15
+ *	from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.24 2001/08/15
  */
 
 #include <sys/cdefs.h>
@@ -129,8 +129,8 @@ __FBSDID("$FreeBSD$");
 static void nexus_bus_barrier(bus_space_tag_t, bus_space_handle_t,
     bus_size_t, bus_size_t, int);
 
-/* ASI's for bus access. */
-int bus_type_asi[] = {
+/* ASIs for bus access */
+const int bus_type_asi[] = {
 	ASI_REAL_IO,		/* nexus */
 	ASI_REAL_IO,		/* SBus */
 	ASI_REAL_IO_L,		/* PCI configuration space */
@@ -139,7 +139,7 @@ int bus_type_asi[] = {
 	0
 };
 
-int bus_stream_asi[] = {
+const int bus_stream_asi[] = {
 	ASI_REAL_IO,		/* nexus */
 	ASI_REAL_IO,		/* SBus */
 	ASI_REAL_IO,		/* PCI configuration space */
@@ -249,7 +249,7 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
 
 	newtag->dt_segments = NULL;
 
-	/* Take into account any restrictions imposed by our parent tag */
+	/* Take into account any restrictions imposed by our parent tag. */
 	if (parent != NULL) {
 		newtag->dt_lowaddr = ulmin(parent->dt_lowaddr,
 		    newtag->dt_lowaddr);
@@ -551,8 +551,7 @@ nexus_dmamap_load_uio(bus_dma_tag_t dmat, bus_dmamap_t map, struct uio *uio,
 
 	if (uio->uio_segflg == UIO_USERSPACE) {
 		td = uio->uio_td;
-		KASSERT(td != NULL,
-			("nexus_dmamap_load_uio: USERSPACE but no proc"));
+		KASSERT(td != NULL, ("%s: USERSPACE but no proc", __func__));
 	}
 
 	nsegs = 0;
@@ -652,9 +651,9 @@ nexus_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int flags,
 		*vaddr = malloc(dmat->dt_maxsize, M_DEVBUF, mflags);
 	} else {
 		/*
-		 * XXX: Use contigmalloc until it is merged into this facility
-		 * and handles multi-seg allocations.  Nobody is doing multi-seg
-		 * allocations yet though.
+		 * XXX use contigmalloc until it is merged into this
+		 * facility and handles multi-seg allocations.  Nobody
+		 * is doing multi-seg allocations yet though.
 		 */
 		*vaddr = contigmalloc(dmat->dt_maxsize, M_DEVBUF, mflags,
 		    0ul, dmat->dt_lowaddr,
@@ -795,8 +794,8 @@ sparc64_bus_mem_unmap(void *bh, bus_size_t size)
 }
 
 /*
- * Fake up a bus tag, for use by console drivers in early boot when the regular
- * means to allocate resources are not yet available.
+ * Fake up a bus tag, for use by console drivers in early boot when the
+ * regular means to allocate resources are not yet available.
  * Addr is the physical address of the desired start of the handle.
  */
 bus_space_handle_t