diff options
| author | Alexander van Heukelum <heukelum@fastmail.fm> | 2008-10-03 22:00:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 10:33:23 +0200 |
| commit | 4915a35e35a037254550a2ba9f367a812bc37d40 (patch) | |
| tree | e1f52e97d70d295aad9747c42223f08d46c18266 /arch/x86 | |
| parent | 091d30c8f7744f43b0bb507fd30ceb95f9ff9e1b (diff) | |
| download | linux-stable-4915a35e35a037254550a2ba9f367a812bc37d40.tar.gz linux-stable-4915a35e35a037254550a2ba9f367a812bc37d40.tar.bz2 linux-stable-4915a35e35a037254550a2ba9f367a812bc37d40.zip | |
traps: i386: use preempt_conditional_sti/cli in do_int3
Use preempt_conditional_sti/cli in do_int3, like on x86_64.
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/traps_32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index 2c7ea3827713..67953bbe193d 100644 --- 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); } /* |