Skip to content

Commit

Permalink
traps: i386: use preempt_conditional_sti/cli in do_int3
Browse files Browse the repository at this point in the history
Use preempt_conditional_sti/cli in do_int3, like on x86_64.

Signed-off-by: Alexander van Heukelum <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
  • Loading branch information
heukelum authored and Ingo Molnar committed Oct 13, 2008
1 parent 091d30c commit 4915a35
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/x86/kernel/traps_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down

0 comments on commit 4915a35

Please sign in to comment.