Index: uspace/lib/c/arch/amd64/src/fibril.S
===================================================================
--- uspace/lib/c/arch/amd64/src/fibril.S	(revision 3b0f1b9a04083e5b48162443937d5e8d8303e4d0)
+++ uspace/lib/c/arch/amd64/src/fibril.S	(revision 57c2a87b03a0b6c08cef4f64f0cf52a7d8b38b62)
@@ -51,5 +51,4 @@
 	movq %r15, CONTEXT_OFFSET_R15(%rdi)
 	
-	# save TLS
 	movq %fs:0, %rax
 	movq %rax, CONTEXT_OFFSET_TLS(%rdi)
@@ -79,8 +78,6 @@
 	movq %rdx,(%rsp)
 	
-	# Set thread local storage
-	movq CONTEXT_OFFSET_TLS(%rdi), %rdi  # Set arg1 to TLS addr
-	movl $1, %eax                        # SYS_TLS_SET
-	syscall
+	movq CONTEXT_OFFSET_TLS(%rdi), %rdi
+	movq %rdi, %fs:0
 	
 	xorl %eax, %eax                      # context_restore returns 0