Index: arch/amd64/src/proc/scheduler.c
===================================================================
--- arch/amd64/src/proc/scheduler.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
+++ arch/amd64/src/proc/scheduler.c	(revision c715e9b93d5ce15f27506aa32b70bfc97c8630bf)
@@ -46,4 +46,7 @@
 	swapgs();
 
+	/* TLS support - set FS to thread local storage */
+	write_msr(AMD_MSR_FS, THREAD->tls);
+
 #ifdef CONFIG_DEBUG_AS_WATCHPOINT
 	/* Set watchpoint on AS to ensure that nobody sets it to zero */