aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64/kernel/entry.S
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2006-01-11 22:42:20 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 19:01:10 -0800
commit505cc4e1d6885acaee008950ac9c6e838f2209f8 (patch)
tree068e4d458f02003853d7d9a1a8a6b72338222f94 /arch/x86_64/kernel/entry.S
parenteca37c18beb306dd9dea4579d7214e1b4414b3fb (diff)
[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>
Diffstat (limited to 'arch/x86_64/kernel/entry.S')
-rw-r--r--arch/x86_64/kernel/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index 9ff42041bb6..bd21ebafaf6 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/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: