Index: kernel/arch/amd64/src/proc/scheduler.c
===================================================================
--- kernel/arch/amd64/src/proc/scheduler.c	(revision a7220ded2adcc7fd89141a6e52314711ef30dee8)
+++ kernel/arch/amd64/src/proc/scheduler.c	(revision c8dea4f25d0f60058737c05d015ab272ce8cd3c4)
@@ -38,5 +38,4 @@
 #include <proc/thread.h>
 #include <arch.h>
-#include <arch/context.h>
 #include <arch/asm.h>
 #include <print.h>
@@ -57,5 +56,5 @@
 {
 	CPU->arch.tss->rsp0 =
-	    (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA];
+	    (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE];
 	
 	/*