Index: boot/arch/sparc64/src/ofw.c
===================================================================
--- boot/arch/sparc64/src/ofw.c	(revision 1433ecda9b732f3f185f902feb26826ec2496e03)
+++ boot/arch/sparc64/src/ofw.c	(revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed)
@@ -88,7 +88,7 @@
 				 * "cpuid" for US-IV
 				 */
-				if ((ofw_get_property(child, "upa-portid", &mid, sizeof(mid)) <= 0)
-				    && (ofw_get_property(child, "portid", &mid, sizeof(mid)) <= 0)
-				    && (ofw_get_property(child, "cpuid", &mid, sizeof(mid)) <= 0))
+				if ((ofw_get_property(child, "upa-portid", &mid, sizeof(mid)) <= 0) &&
+				    (ofw_get_property(child, "portid", &mid, sizeof(mid)) <= 0) &&
+				    (ofw_get_property(child, "cpuid", &mid, sizeof(mid)) <= 0))
 					continue;
 
@@ -117,8 +117,8 @@
 
 	asm volatile (
-		"ldxa [%[zero]] %[asi], %[current_mid]\n"
-		: [current_mid] "=r" (current_mid)
-		: [zero] "r" (0),
-		  [asi] "i" (ASI_ICBUS_CONFIG)
+	    "ldxa [%[zero]] %[asi], %[current_mid]\n"
+	    : [current_mid] "=r" (current_mid)
+	    : [zero] "r" (0),
+	      [asi] "i" (ASI_ICBUS_CONFIG)
 	);