Index: kernel/arch/sparc64/src/asm.S
===================================================================
--- kernel/arch/sparc64/src/asm.S	(revision 4b2c458c1ae1c1e7d61cae43c278078e533b58cb)
+++ kernel/arch/sparc64/src/asm.S	(revision bf5443db843772effe3c9550c0c52abe77c2ff0e)
@@ -278,5 +278,5 @@
 .global switch_to_userspace
 switch_to_userspace:
-	save %o1, -STACK_WINDOW_SAVE_AREA_SIZE, %sp
+	save %o1, -(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
 	flushw
 	wrpr %g0, 0, %cleanwin		! avoid information leak