Index: kernel/arch/sparc64/include/barrier.h
===================================================================
--- kernel/arch/sparc64/include/barrier.h	(revision 2e915f280805434d5b53bdbfd93227d66d85917c)
+++ kernel/arch/sparc64/include/barrier.h	(revision 07bd231efdff7398a0c1e94cf90ea423ee6cee93)
@@ -40,10 +40,10 @@
  */
 #define CS_ENTER_BARRIER() 				\
-	asm volatile (				\
+	asm volatile (					\
 		"membar #LoadLoad | #LoadStore\n"	\
 		::: "memory"				\
 	)
 #define CS_LEAVE_BARRIER()				\
-	asm volatile ( 				\
+	asm volatile ( 					\
 		"membar #StoreStore\n"			\
 		"membar #LoadStore\n"			\
Index: kernel/arch/sparc64/src/cpu/cpu.c
===================================================================
--- kernel/arch/sparc64/src/cpu/cpu.c	(revision 2e915f280805434d5b53bdbfd93227d66d85917c)
+++ kernel/arch/sparc64/src/cpu/cpu.c	(revision 07bd231efdff7398a0c1e94cf90ea423ee6cee93)
@@ -64,8 +64,8 @@
 			if (mid == CPU->arch.mid) {
 				prop = ofw_tree_getprop(node,
-					"clock-frequency");
+				    "clock-frequency");
 				if (prop && prop->value)
 					clock_frequency = *((uint32_t *)
-						prop->value);
+					    prop->value);
 			}
 		}
Index: kernel/arch/sparc64/src/mm/as.c
===================================================================
--- kernel/arch/sparc64/src/mm/as.c	(revision 2e915f280805434d5b53bdbfd93227d66d85917c)
+++ kernel/arch/sparc64/src/mm/as.c	(revision 07bd231efdff7398a0c1e94cf90ea423ee6cee93)
@@ -67,4 +67,5 @@
 	int order = fnzb32(((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
 	    sizeof(tsb_entry_t)) >> FRAME_WIDTH);
+
 	uintptr_t tsb = (uintptr_t) frame_alloc(order, flags | FRAME_KA);
 
@@ -75,4 +76,5 @@
 	as->arch.dtsb = (tsb_entry_t *) (tsb + ITSB_ENTRY_COUNT *
 	    sizeof(tsb_entry_t));
+
 	memsetb((uintptr_t) as->arch.itsb,
 	    (ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) * sizeof(tsb_entry_t), 0);
Index: kernel/arch/sparc64/src/proc/scheduler.c
===================================================================
--- kernel/arch/sparc64/src/proc/scheduler.c	(revision 2e915f280805434d5b53bdbfd93227d66d85917c)
+++ kernel/arch/sparc64/src/proc/scheduler.c	(revision 07bd231efdff7398a0c1e94cf90ea423ee6cee93)
@@ -63,7 +63,6 @@
 		 *   before it explicitly uses %g7.
 		 */
-		uint64_t sp = (uintptr_t) THREAD->kstack + STACK_SIZE
-			- (STACK_BIAS + ALIGN_UP(STACK_ITEM_SIZE,
-			STACK_ALIGNMENT));
+		uint64_t sp = (uintptr_t) THREAD->kstack + STACK_SIZE -
+		    (STACK_BIAS + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT));
 		write_to_ig_g6(sp);
 		write_to_ag_g6(sp);
Index: kernel/arch/sparc64/src/proc/thread.c
===================================================================
--- kernel/arch/sparc64/src/proc/thread.c	(revision 2e915f280805434d5b53bdbfd93227d66d85917c)
+++ kernel/arch/sparc64/src/proc/thread.c	(revision 07bd231efdff7398a0c1e94cf90ea423ee6cee93)
@@ -56,5 +56,5 @@
 		 */
 		frame_free(KA2PA(ALIGN_DOWN((uintptr_t)
-			t->arch.uspace_window_buffer, PAGE_SIZE)));
+		    t->arch.uspace_window_buffer, PAGE_SIZE)));
 	}
 }
@@ -76,6 +76,6 @@
 		 * belonging to a killed thread.
 		 */
-		 t->arch.uspace_window_buffer = (uint8_t *) ALIGN_DOWN(uw_buf,
-			PAGE_SIZE);
+		t->arch.uspace_window_buffer = (uint8_t *) ALIGN_DOWN(uw_buf,
+		    PAGE_SIZE);
 	}
 }
Index: kernel/arch/sparc64/src/smp/ipi.c
===================================================================
--- kernel/arch/sparc64/src/smp/ipi.c	(revision 2e915f280805434d5b53bdbfd93227d66d85917c)
+++ kernel/arch/sparc64/src/smp/ipi.c	(revision 07bd231efdff7398a0c1e94cf90ea423ee6cee93)
@@ -75,6 +75,6 @@
 	
 	do {
-		asi_u64_write(ASI_UDB_INTR_W, ASI_UDB_INTR_W_DATA_0, (uintptr_t)
-			func);
+		asi_u64_write(ASI_UDB_INTR_W, ASI_UDB_INTR_W_DATA_0,
+		    (uintptr_t)	func);
 		asi_u64_write(ASI_UDB_INTR_W, ASI_UDB_INTR_W_DATA_1, 0);
 		asi_u64_write(ASI_UDB_INTR_W, ASI_UDB_INTR_W_DATA_2, 0);
Index: kernel/arch/sparc64/src/smp/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/smp.c	(revision 2e915f280805434d5b53bdbfd93227d66d85917c)
+++ kernel/arch/sparc64/src/smp/smp.c	(revision 07bd231efdff7398a0c1e94cf90ea423ee6cee93)
@@ -101,5 +101,5 @@
 		if (waitq_sleep_timeout(&ap_completion_wq, 1000000, SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT)
 			printf("%s: waiting for processor (mid = %d) timed out\n",
-				__FUNCTION__, mid);
+			    __FUNCTION__, mid);
 	}
 }