aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/traps_32.c
diff options
context:
space:
mode:
authorAlexander van Heukelum <heukelum@fastmail.fm>2008-10-03 16:00:34 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-13 04:33:23 -0400
commit4915a35e35a037254550a2ba9f367a812bc37d40 (patch)
treee1f52e97d70d295aad9747c42223f08d46c18266 /arch/x86/kernel/traps_32.c
parent091d30c8f7744f43b0bb507fd30ceb95f9ff9e1b (diff)
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/kernel/traps_32.c')
-rw-r--r--arch/x86/kernel/traps_32.c3
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)
477 if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP) 477 if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP)
478 == NOTIFY_STOP) 478 == NOTIFY_STOP)
479 return; 479 return;
480 conditional_sti(regs);
481#else 480#else
482 if (notify_die(DIE_TRAP, "int3", regs, error_code, 3, SIGTRAP) 481 if (notify_die(DIE_TRAP, "int3", regs, error_code, 3, SIGTRAP)
483 == NOTIFY_STOP) 482 == NOTIFY_STOP)
484 return; 483 return;
485#endif 484#endif
486 485
486 preempt_conditional_sti(regs);
487 do_trap(3, SIGTRAP, "int3", regs, error_code, NULL); 487 do_trap(3, SIGTRAP, "int3", regs, error_code, NULL);
488 preempt_conditional_cli(regs);
488} 489}
489 490
490/* 491/*