Merge branch '85xx' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc

[linux-2.6-omap-h63xx.git] / arch / x86_64 / kernel / entry.S

diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index b150c87a08c6b3131909d8af5b567699e58ce098..7c10e9009d611173d13fddf90650a9dfe78ec7db 100644 (file)
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -554,6 +554,7 @@ iret_label:
        /* running with kernel gs */
 bad_iret:
        movq $-9999,%rdi        /* better code? */
+       sti
        jmp do_exit                     
        .previous