Index: arch/ia32/src/proc/scheduler.c
===================================================================
--- arch/ia32/src/proc/scheduler.c	(revision b07769b60d28ebef7ed6f9ae8366f444e8ecc7fa)
+++ arch/ia32/src/proc/scheduler.c	(revision dfbc2297945596bc138ea300b50da69b23b48d2a)
@@ -31,8 +31,9 @@
 #include <proc/thread.h>
 #include <arch.h>
+#include <arch/context.h>	/* SP_DELTA */
 
 void before_thread_runs_arch(void)
 {
-	CPU->arch.tss->esp0 = (__address) &THREAD->kstack[THREAD_STACK_SIZE-8];
+	CPU->arch.tss->esp0 = (__address) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
 	CPU->arch.tss->ss0 = selector(KDATA_DES);
 }