Index: src/main/main.c
===================================================================
--- src/main/main.c	(revision 244f2842214f05788f7dcb3885f53a6a89cb90bb)
+++ src/main/main.c	(revision f3ebb6497f267e4a44a4e59b458382cb8b11bc98)
@@ -95,5 +95,5 @@
 
 	context_save(&ctx);
-	ctx.sp = config.base + config.kernel_size - 8;
+	ctx.sp = config.base + config.kernel_size - SP_DELTA;
 	ctx.pc = FADDR(main_bsp_separated_stack);
 	context_restore(&ctx);
@@ -193,5 +193,5 @@
 	 * switch to this cpu's private stack prior to waking kmp up.
 	 */
-	CPU->saved_context.sp = (__address) &CPU->stack[CPU_STACK_SIZE-8];
+	CPU->saved_context.sp = (__address) &CPU->stack[CPU_STACK_SIZE-SP_DELTA];
 	CPU->saved_context.pc = FADDR(main_ap_separated_stack);
 	context_restore(&CPU->saved_context);