commit 505cc4e1d6885acaee008950ac9c6e838f2209f8
author Jan Beulich <jbeulich@novell.com> Wed Jan 11 22:42:20 2006 +0100
committer Linus Torvalds <torvalds@g5.osdl.org> Wed Jan 11 19:01:10 2006 -0800
tree 068e4d458f02003853d7d9a1a8a6b72338222f94
parent eca37c18beb306dd9dea4579d7214e1b4414b3fb

[PATCH] x86_64: Remove unprotected iret

Make sure no iret can fault without attached recovery code.
Cannot happen in the normal case, but might be useful
with kernel debuggers

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/x86_64/kernel/entry.S

diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index 9ff4204..bd21eba 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -754,7 +754,7 @@
 	jnz  retint_careful
 	swapgs 
 	RESTORE_ARGS 0,8,0						
-	iretq
+	jmp iret_label
 	CFI_ENDPROC
 
 error_kernelspace: