Index: kernel/arch/ia32/src/proc/scheduler.c
===================================================================
--- kernel/arch/ia32/src/proc/scheduler.c	(revision c5396c1804ab53d2d15266e72be0b0617bebb8b3)
+++ kernel/arch/ia32/src/proc/scheduler.c	(revision 7ba16eb2305f77c05ab9260d09fae55d5c25fa4f)
@@ -70,7 +70,4 @@
 	CPU->arch.tss->esp0 = kstk;
 	CPU->arch.tss->ss0 = GDT_SELECTOR(KDATA_DES);
-	
-	/* Set up TLS in GS register */
-	set_tls_desc(THREAD->arch.tls);
 }
 
Index: kernel/arch/ia32/src/proc/thread.c
===================================================================
--- kernel/arch/ia32/src/proc/thread.c	(revision c5396c1804ab53d2d15266e72be0b0617bebb8b3)
+++ kernel/arch/ia32/src/proc/thread.c	(revision 7ba16eb2305f77c05ab9260d09fae55d5c25fa4f)
@@ -41,5 +41,4 @@
 void thread_create_arch(thread_t *t)
 {
-	t->arch.tls = 0;
 }