Index: kernel/arch/sparc64/src/proc/scheduler.c
===================================================================
--- kernel/arch/sparc64/src/proc/scheduler.c	(revision 7e7c8747752c7ffe6c991792c4afdde7b1128b58)
+++ kernel/arch/sparc64/src/proc/scheduler.c	(revision 730376d1b21f93d17f9ba190a599809dcb0a13a7)
@@ -95,7 +95,13 @@
 		
 		/*
-		 * Write kernel stack address to %g6 and a pointer to the last
-		 * item in the userspace window buffer to %g7 in the alternate
-		 * and interrupt sets.
+		 * Write kernel stack address to %g6 of the alternate and
+		 * interrupt global sets.
+		 *
+		 * Write pointer to the last item in the userspace window buffer
+		 * to %g7 in the alternate set. Write to the interrupt %g7 is
+		 * not necessary because:
+		 * - spill traps operate only in the alternate global set,
+		 * - preemptible trap handler switches to alternate globals
+		 *   before it explicitly uses %g7.
 		 */
 		uint64_t sp = (uintptr_t) THREAD->kstack + STACK_SIZE
@@ -110,5 +116,5 @@
 /** Perform sparc64 specific steps before a thread stops running.
  *
- * Demap any locked DTLB entries isntalled by the thread (i.e. kernel stack
+ * Demap any locked DTLB entries installed by the thread (i.e. kernel stack
  * and userspace window buffer).
  */
Index: kernel/arch/sparc64/src/smp/ipi.c
===================================================================
--- kernel/arch/sparc64/src/smp/ipi.c	(revision 7e7c8747752c7ffe6c991792c4afdde7b1128b58)
+++ kernel/arch/sparc64/src/smp/ipi.c	(revision 730376d1b21f93d17f9ba190a599809dcb0a13a7)
@@ -74,8 +74,11 @@
 	
 	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);
-		asi_u64_write(ASI_UDB_INTR_W, (mid << INTR_VEC_DISPATCH_MID_SHIFT) | ASI_UDB_INTR_W_DISPATCH, 0);
+		asi_u64_write(ASI_UDB_INTR_W, (mid <<
+			INTR_VEC_DISPATCH_MID_SHIFT) | ASI_UDB_INTR_W_DISPATCH,
+			0);
 	
 		membar();
Index: kernel/arch/sparc64/src/trap/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/interrupt.c	(revision 7e7c8747752c7ffe6c991792c4afdde7b1128b58)
+++ kernel/arch/sparc64/src/trap/interrupt.c	(revision 730376d1b21f93d17f9ba190a599809dcb0a13a7)
@@ -98,5 +98,6 @@
 		 */
 #ifdef CONFIG_DEBUG
-		printf("cpu%d: spurious interrupt (intrcv=%#llx, data0=%#llx)\n", CPU->id, intrcv, data0);
+		printf("cpu%d: spurious interrupt (intrcv=%#llx, "
+			"data0=%#llx)\n", CPU->id, intrcv, data0);
 #endif
 	}