Index: uspace/lib/c/arch/amd64/include/libarch/tls.h
===================================================================
--- uspace/lib/c/arch/amd64/include/libarch/tls.h	(revision fbf4dc15a173ec71ac8e14554253e83258dacec1)
+++ uspace/lib/c/arch/amd64/include/libarch/tls.h	(revision 9a08e6bddeb3cffb3e0438813da2a3084dcd33c5)
@@ -47,12 +47,12 @@
 static inline void __tcb_set(tcb_t *tcb)
 {
-	__SYSCALL1(SYS_TLS_SET, (sysarg_t) tcb);
+	asm volatile ("movq %0, %%fs:0" :: "r" (tcb));
 }
 
-static inline tcb_t * __tcb_get(void)
+static inline tcb_t *__tcb_get(void)
 {
-	void * retval;
+	void *retval;
 
-	asm ("movq %%fs:0, %0" : "=r"(retval));
+	asm volatile ("movq %%fs:0, %0" : "=r" (retval));
 	return retval;
 }