diff --git a/[refs] b/[refs]
index 707d3fbadc99..02f5bab962fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eca37c18beb306dd9dea4579d7214e1b4414b3fb
+refs/heads/master: 505cc4e1d6885acaee008950ac9c6e838f2209f8
diff --git a/trunk/arch/x86_64/kernel/entry.S b/trunk/arch/x86_64/kernel/entry.S
index 9ff42041bb6b..bd21ebafaf66 100644
--- a/trunk/arch/x86_64/kernel/entry.S
+++ b/trunk/arch/x86_64/kernel/entry.S
@@ -754,7 +754,7 @@ error_exit:
 	jnz  retint_careful
 	swapgs 
 	RESTORE_ARGS 0,8,0						
-	iretq
+	jmp iret_label
 	CFI_ENDPROC
 
 error_kernelspace: