x86: make traps on 'iret' be debuggable in user space

[pandora-kernel.git] / arch / i386 / kernel / entry.S

diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
index 3c73dc8..fe1918c 100644 (file)
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
@@ -260,11 +260,9 @@ restore_nocheck:
 .section .fixup,"ax"
 iret_exc:
        sti
-       movl $__USER_DS, %edx
-       movl %edx, %ds
-       movl %edx, %es
-       movl $11,%eax
-       call do_exit
+       pushl $0                        # no error code
+       pushl $do_iret_error
+       jmp error_code
 .previous
 .section __ex_table,"a"
        .align 4