traps: i386: use preempt_conditional_sti/cli in do_int3

[karo-tx-linux.git] / arch / x86 / kernel / traps_32.c

diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 2c7ea382771315f95d30f4ea03c06710179f2ce1..67953bbe193d2684be77c18e06b01bb837f06e29 100644 (file)
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -477,14 +477,15 @@ dotraplinkage void __kprobes do_int3(struct pt_regs *regs, long error_code)
        if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP)
                        == NOTIFY_STOP)
                return;
-       conditional_sti(regs);
 #else
        if (notify_die(DIE_TRAP, "int3", regs, error_code, 3, SIGTRAP)
                        == NOTIFY_STOP)
                return;
 #endif
 
+       preempt_conditional_sti(regs);
        do_trap(3, SIGTRAP, "int3", regs, error_code, NULL);
+       preempt_conditional_cli(regs);
 }
 
 /*