Index: kernel/arch/amd64/src/proc/scheduler.c
===================================================================
--- kernel/arch/amd64/src/proc/scheduler.c	(revision 2438fa6a9b8e68cb9f47b431a63f2c238edf5691)
+++ kernel/arch/amd64/src/proc/scheduler.c	(revision eaeb056a0ab6f097e04deb6010499a3da2bc19e4)
@@ -56,5 +56,5 @@
 {
 	CPU->arch.tss->rsp0 =
-	    (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE];
+	    (uintptr_t) &THREAD->kstack[STACK_SIZE];
 	
 	/*
Index: kernel/arch/amd64/src/userspace.c
===================================================================
--- kernel/arch/amd64/src/userspace.c	(revision 2438fa6a9b8e68cb9f47b431a63f2c238edf5691)
+++ kernel/arch/amd64/src/userspace.c	(revision eaeb056a0ab6f097e04deb6010499a3da2bc19e4)
@@ -66,5 +66,5 @@
 		"iretq\n"
 		:: [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-		   [stack_size] "r" (kernel_uarg->uspace_stack + THREAD_STACK_SIZE),
+		   [stack_size] "r" (kernel_uarg->uspace_stack + STACK_SIZE),
 		   [ipl] "r" (ipl),
 		   [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),