Index: kernel/arch/amd64/src/context.S
===================================================================
--- kernel/arch/amd64/src/context.S	(revision 7ba16eb2305f77c05ab9260d09fae55d5c25fa4f)
+++ kernel/arch/amd64/src/context.S	(revision 436300063cf897d3a8d003c018a42e184f48d928)
@@ -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