Index: kernel/arch/amd64/src/boot/multiboot.S
===================================================================
--- kernel/arch/amd64/src/boot/multiboot.S	(revision 6e5252a21fc011ffd91ddded1ae5f8647705f169)
+++ kernel/arch/amd64/src/boot/multiboot.S	(revision 33ef2f2419b2f41cb9a1147279e99e224fce6e2e)
@@ -44,6 +44,4 @@
 //       the image to get very early debug output.
 
-#define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
-
 .section .multiboot, "a"
 
@@ -99,5 +97,5 @@
 
 	/* Initialize stack pointer */
-	movl $START_STACK, %esp
+	movl $bootstack_top, %esp
 
 	/*
@@ -436,5 +434,5 @@
 	 */
 
-	movq $(PA2KA(START_STACK)), %rsp
+	movq $(PA2KA(bootstack_top)), %rsp
 
 	/* Create the first stack frame */