Revert r216134. This checkin broke platforms where bus_space are macros:

they need to be a single statement, and do { } while (0) doesn't work in this
situation so revert until a solution can be devised.

1 files changed, 56 insertions, 59 deletions

diff --git a/sys/sun4v/include/bus.h b/sys/sun4v/include/bus.h
index 8fe0731..51a7ea5 100644
--- a/sys/sun4v/include/bus.h
+++ b/sys/sun4v/include/bus.h
@@ -79,9 +79,6 @@
 #include <sys/ktr.h>
 #endif
 
-#include <sys/param.h>
-#include <sys/systm.h>
-
 #include <machine/_bus.h>
 #include <machine/cpufunc.h>
 
@@ -242,7 +239,7 @@ static __inline void
 bus_space_read_multi_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     uint8_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		*a++ = bus_space_read_1(t, h, o);
 }
@@ -251,7 +248,7 @@ static __inline void
 bus_space_read_multi_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     uint16_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		*a++ = bus_space_read_2(t, h, o);
 }
@@ -260,7 +257,7 @@ static __inline void
 bus_space_read_multi_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     uint32_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		*a++ = bus_space_read_4(t, h, o);
 }
@@ -269,7 +266,7 @@ static __inline void
 bus_space_read_multi_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     uint64_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		*a++ = bus_space_read_8(t, h, o);
 }
@@ -314,7 +311,7 @@ static __inline void
 bus_space_write_multi_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     const uint8_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_1(t, h, o, *a++);
 }
@@ -323,7 +320,7 @@ static __inline void
 bus_space_write_multi_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     const uint16_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_2(t, h, o, *a++);
 }
@@ -332,7 +329,7 @@ static __inline void
 bus_space_write_multi_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     const uint32_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_4(t, h, o, *a++);
 }
@@ -341,7 +338,7 @@ static __inline void
 bus_space_write_multi_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     const uint64_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_8(t, h, o, *a++);
 }
@@ -350,7 +347,7 @@ static __inline void
 bus_space_set_multi_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     uint8_t v, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_1(t, h, o, v);
 }
@@ -359,7 +356,7 @@ static __inline void
 bus_space_set_multi_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     uint16_t v, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_2(t, h, o, v);
 }
@@ -368,7 +365,7 @@ static __inline void
 bus_space_set_multi_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     uint32_t v, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_4(t, h, o, v);
 }
@@ -377,7 +374,7 @@ static __inline void
 bus_space_set_multi_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     uint64_t v, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_8(t, h, o, v);
 }
@@ -386,7 +383,7 @@ static __inline void
 bus_space_read_region_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     uint8_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o++)
 		*a = bus_space_read_1(t, h, o);
 }
@@ -395,7 +392,7 @@ static __inline void
 bus_space_read_region_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     uint16_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o += 2)
 		*a = bus_space_read_2(t, h, o);
 }
@@ -404,7 +401,7 @@ static __inline void
 bus_space_read_region_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     uint32_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o += 4)
 		*a = bus_space_read_4(t, h, o);
 }
@@ -413,7 +410,7 @@ static __inline void
 bus_space_read_region_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     uint64_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o += 8)
 		*a = bus_space_read_8(t, h, o);
 }
@@ -422,7 +419,7 @@ static __inline void
 bus_space_write_region_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     const uint8_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o++)
 		bus_space_write_1(t, h, o, *a);
 }
@@ -431,7 +428,7 @@ static __inline void
 bus_space_write_region_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     const uint16_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o += 2)
 		bus_space_write_2(t, h, o, *a);
 }
@@ -440,7 +437,7 @@ static __inline void
 bus_space_write_region_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     const uint32_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o += 4)
 		bus_space_write_4(t, h, o, *a);
 }
@@ -449,7 +446,7 @@ static __inline void
 bus_space_write_region_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     const uint64_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o += 8)
 		bus_space_write_8(t, h, o, *a);
 }
@@ -458,7 +455,7 @@ static __inline void
 bus_space_set_region_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     const uint8_t v, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o++)
 		bus_space_write_1(t, h, o, v);
 }
@@ -467,7 +464,7 @@ static __inline void
 bus_space_set_region_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     const uint16_t v, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o += 2)
 		bus_space_write_2(t, h, o, v);
 }
@@ -476,7 +473,7 @@ static __inline void
 bus_space_set_region_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     const uint32_t v, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o += 4)
 		bus_space_write_4(t, h, o, v);
 }
@@ -485,7 +482,7 @@ static __inline void
 bus_space_set_region_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
     const uint64_t v, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o += 8)
 		bus_space_write_8(t, h, o, v);
 }
@@ -494,7 +491,7 @@ static __inline void
 bus_space_copy_region_1(bus_space_tag_t t, bus_space_handle_t h1,
     bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o1++, o2++)
 	    bus_space_write_1(t, h1, o1, bus_space_read_1(t, h2, o2));
 }
@@ -503,7 +500,7 @@ static __inline void
 bus_space_copy_region_2(bus_space_tag_t t, bus_space_handle_t h1,
     bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o1 += 2, o2 += 2)
 	    bus_space_write_2(t, h1, o1, bus_space_read_2(t, h2, o2));
 }
@@ -512,7 +509,7 @@ static __inline void
 bus_space_copy_region_4(bus_space_tag_t t, bus_space_handle_t h1,
     bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o1 += 4, o2 += 4)
 	    bus_space_write_4(t, h1, o1, bus_space_read_4(t, h2, o2));
 }
@@ -521,7 +518,7 @@ static __inline void
 bus_space_copy_region_8(bus_space_tag_t t, bus_space_handle_t h1,
     bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o1 += 8, o2 += 8)
 	    bus_space_write_8(t, h1, o1, bus_space_read_8(t, h2, o2));
 }
@@ -562,7 +559,7 @@ static __inline void
 bus_space_read_multi_stream_1(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, uint8_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		*a++ = bus_space_read_stream_1(t, h, o);
 }
@@ -571,7 +568,7 @@ static __inline void
 bus_space_read_multi_stream_2(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, uint16_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		*a++ = bus_space_read_stream_2(t, h, o);
 }
@@ -580,7 +577,7 @@ static __inline void
 bus_space_read_multi_stream_4(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, uint32_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		*a++ = bus_space_read_stream_4(t, h, o);
 }
@@ -589,7 +586,7 @@ static __inline void
 bus_space_read_multi_stream_8(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, uint64_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		*a++ = bus_space_read_stream_8(t, h, o);
 }
@@ -634,7 +631,7 @@ static __inline void
 bus_space_write_multi_stream_1(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, const uint8_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_stream_1(t, h, o, *a++);
 }
@@ -643,7 +640,7 @@ static __inline void
 bus_space_write_multi_stream_2(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, const uint16_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_stream_2(t, h, o, *a++);
 }
@@ -652,7 +649,7 @@ static __inline void
 bus_space_write_multi_stream_4(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, const uint32_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_stream_4(t, h, o, *a++);
 }
@@ -661,7 +658,7 @@ static __inline void
 bus_space_write_multi_stream_8(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, const uint64_t *a, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_stream_8(t, h, o, *a++);
 }
@@ -670,7 +667,7 @@ static __inline void
 bus_space_set_multi_stream_1(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, uint8_t v, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_stream_1(t, h, o, v);
 }
@@ -679,7 +676,7 @@ static __inline void
 bus_space_set_multi_stream_2(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, uint16_t v, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_stream_2(t, h, o, v);
 }
@@ -688,7 +685,7 @@ static __inline void
 bus_space_set_multi_stream_4(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, uint32_t v, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_stream_4(t, h, o, v);
 }
@@ -697,7 +694,7 @@ static __inline void
 bus_space_set_multi_stream_8(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, uint64_t v, size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	while (c-- > 0)
 		bus_space_write_stream_8(t, h, o, v);
 }
@@ -706,7 +703,7 @@ static __inline void
 bus_space_read_region_stream_1(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, uint8_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o++)
 		*a = bus_space_read_stream_1(t, h, o);
 }
@@ -715,7 +712,7 @@ static __inline void
 bus_space_read_region_stream_2(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, uint16_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o += 2)
 		*a = bus_space_read_stream_2(t, h, o);
 }
@@ -724,7 +721,7 @@ static __inline void
 bus_space_read_region_stream_4(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, uint32_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o += 4)
 		*a = bus_space_read_stream_4(t, h, o);
 }
@@ -733,7 +730,7 @@ static __inline void
 bus_space_read_region_stream_8(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, uint64_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o += 8)
 		*a = bus_space_read_stream_8(t, h, o);
 }
@@ -742,7 +739,7 @@ static __inline void
 bus_space_write_region_stream_1(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, const uint8_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o++)
 		bus_space_write_stream_1(t, h, o, *a);
 }
@@ -751,7 +748,7 @@ static __inline void
 bus_space_write_region_stream_2(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, const uint16_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o += 2)
 		bus_space_write_stream_2(t, h, o, *a);
 }
@@ -760,7 +757,7 @@ static __inline void
 bus_space_write_region_stream_4(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, const uint32_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o += 4)
 		bus_space_write_stream_4(t, h, o, *a);
 }
@@ -769,7 +766,7 @@ static __inline void
 bus_space_write_region_stream_8(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, const uint64_t *a, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; a++, c--, o += 8)
 		bus_space_write_stream_8(t, h, o, *a);
 }
@@ -778,7 +775,7 @@ static __inline void
 bus_space_set_region_stream_1(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, const uint8_t v, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o++)
 		bus_space_write_stream_1(t, h, o, v);
 }
@@ -787,7 +784,7 @@ static __inline void
 bus_space_set_region_stream_2(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, const uint16_t v, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o += 2)
 		bus_space_write_stream_2(t, h, o, v);
 }
@@ -796,7 +793,7 @@ static __inline void
 bus_space_set_region_stream_4(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, const uint32_t v, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o += 4)
 		bus_space_write_stream_4(t, h, o, v);
 }
@@ -805,7 +802,7 @@ static __inline void
 bus_space_set_region_stream_8(bus_space_tag_t t, bus_space_handle_t h,
     bus_size_t o, const uint64_t v, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o += 8)
 		bus_space_write_stream_8(t, h, o, v);
 }
@@ -814,7 +811,7 @@ static __inline void
 bus_space_copy_region_stream_1(bus_space_tag_t t, bus_space_handle_t h1,
     bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o1++, o2++)
 	    bus_space_write_stream_1(t, h1, o1, bus_space_read_stream_1(t, h2,
 		o2));
@@ -824,7 +821,7 @@ static __inline void
 bus_space_copy_region_stream_2(bus_space_tag_t t, bus_space_handle_t h1,
     bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o1 += 2, o2 += 2)
 	    bus_space_write_stream_2(t, h1, o1, bus_space_read_stream_2(t, h2,
 		o2));
@@ -834,7 +831,7 @@ static __inline void
 bus_space_copy_region_stream_4(bus_space_tag_t t, bus_space_handle_t h1,
     bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o1 += 4, o2 += 4)
 	    bus_space_write_stream_4(t, h1, o1, bus_space_read_stream_4(t, h2,
 		o2));
@@ -844,7 +841,7 @@ static __inline void
 bus_space_copy_region_stream_8(bus_space_tag_t t, bus_space_handle_t h1,
     bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
 {
-	KASSERT(c != 0, ("%s: count == 0", __func__));
+
 	for (; c; c--, o1 += 8, o2 += 8)
 	    bus_space_write_stream_8(t, h1, o1, bus_space_read_8(t, h2, o2));
 }