Index: kernel/arch/amd64/src/context.S
===================================================================
--- kernel/arch/amd64/src/context.S	(revision 4928165de7cf0ac048c2faf57cbe0209de03919c)
+++ kernel/arch/amd64/src/context.S	(revision c342e885eda678f90d94f87b8d6e3fa21ef72784)
@@ -39,7 +39,6 @@
 #
 FUNCTION_BEGIN(context_save_arch)
-	movq (%rsp), %rdx     # the caller's return %eip
+	movq (%rsp), %rdx     # the caller's return %rip
 	
-	# 1st argument passed in %edi
 	movq %rdx, CONTEXT_OFFSET_PC(%rdi)
 	movq %rsp, CONTEXT_OFFSET_SP(%rdi)
@@ -75,5 +74,5 @@
 	movq CONTEXT_OFFSET_RBX(%rdi), %rbx
 	
-	movq CONTEXT_OFFSET_SP(%rdi), %rsp   # ctx->sp -> %rsp
+	movq CONTEXT_OFFSET_SP(%rdi), %rsp
 	
 	movq CONTEXT_OFFSET_PC(%rdi), %rdx