Index: kernel/arch/sparc64/src/proc/scheduler.c
===================================================================
--- kernel/arch/sparc64/src/proc/scheduler.c	(revision 9b0f294d258634a764d70ae5a5088d9a836e88a6)
+++ kernel/arch/sparc64/src/proc/scheduler.c	(revision 208fa65660addbbf3528a9906e20dfdbf552bc78)
@@ -93,5 +93,5 @@
 		 */
 		uint64_t sp = (uintptr_t) THREAD->kstack + STACK_SIZE
-			- (STACK_BIAS + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_WINDOW_SAVE_AREA_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/sparc64.c
===================================================================
--- kernel/arch/sparc64/src/sparc64.c	(revision 9b0f294d258634a764d70ae5a5088d9a836e88a6)
+++ kernel/arch/sparc64/src/sparc64.c	(revision 208fa65660addbbf3528a9906e20dfdbf552bc78)
@@ -99,5 +99,5 @@
 	switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
 		((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE
-		- (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS + STACK_WINDOW_SAVE_AREA_SIZE),
+		- (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
 		(uintptr_t) kernel_uarg->uspace_uarg);