Index: arch/amd64/src/asm_utils.S
===================================================================
--- arch/amd64/src/asm_utils.S	(revision 37b451f7a8c252d1c0a3c5b78efd144d682378ec)
+++ arch/amd64/src/asm_utils.S	(revision 47c83bcb3e0f2196c57beafc037ebc86b7a1b0de)
@@ -36,4 +36,5 @@
 #include <arch/pm.h>
 #include <arch/context_offset.h>
+#include <arch/mm/page.h>
 	
 .text
@@ -195,9 +196,7 @@
 	# Switch to hidden gs	
 	swapgs
-
-	# TODO:	I would like LEA instead of thes 2 instrs,
-	# why does not it work???
-	mov %gs:0, %r10     # We have a stack in r10
-	addq $0x0ff0, %r10
+	# %gs:0 now points to pointer to stack page
+	mov %gs:0, %r10     # We have a ptr to stack page in r10
+	addq $PAGE_SIZE-16, %r10 # We need some space to store old %sp
 	
 	movq %rsp, 0(%r10)  # Save old stack pointer to stack