Index: kernel/arch/sparc64/src/asm.S
===================================================================
--- kernel/arch/sparc64/src/asm.S	(revision 716fb9d713ceb210b9824bd965bbd54b4a054b9f)
+++ kernel/arch/sparc64/src/asm.S	(revision 50cfa6cd85f434dea3072039821d26b5943f656d)
@@ -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