x86/entry/32: Fix entry_INT80_32() to expect interrupts to be on

[karo-tx-linux.git] / arch / x86 / entry / entry_32.S

diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
index c1c7c636421681c71050c153131dde2699632c7e..4f97f49261d365a3bcce383adc749e8a0eec4c34 100644 (file)
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
@@ -345,13 +345,13 @@ ENTRY(entry_INT80_32)
        SAVE_ALL pt_regs_ax=$-ENOSYS    /* save rest */
 
        /*
-        * User mode is traced as though IRQs are on, and the interrupt gate
-        * turned them off.
+        * User mode is traced as though IRQs are on.  Unlike the 64-bit
+        * case, INT80 is a trap gate on 32-bit kernels, so interrupts
+        * are already on (unless user code is messing around with iopl).
         */
-       TRACE_IRQS_OFF
 
        movl    %esp, %eax
-       call    do_int80_syscall_32
+       call    do_syscall_32_irqs_on
 .Lsyscall_32_done:
 
 restore_all: