Index: arch/ia32/src/proc/scheduler.c
===================================================================
--- arch/ia32/src/proc/scheduler.c	(revision 6c6a19e69c1590fe11db392c881db419fd28d8e1)
+++ arch/ia32/src/proc/scheduler.c	(revision 303c94cdd8202c405e0544a6b985691b33904b12)
@@ -33,4 +33,5 @@
 #include <arch/context.h>	/* SP_DELTA */
 #include <arch/debugger.h>
+#include <arch/pm.h>
 
 void before_thread_runs_arch(void)
@@ -38,4 +39,7 @@
 	CPU->arch.tss->esp0 = (__address) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
 	CPU->arch.tss->ss0 = selector(KDATA_DES);
+
+	/* Set up TLS in GS register */
+	set_tls_desc(THREAD->tls);
 
 #ifdef CONFIG_DEBUG_AS_WATCHPOINT