[PATCH 3/9] traps: i386: use preempt_conditional_sti/cli in do_int3
- From: Alexander van Heukelum <heukelum@xxxxxxxxxxx>
- Date: Fri, 3 Oct 2008 22:00:34 +0200
Use preempt_conditional_sti/cli in do_int3, like on x86_64.
Signed-off-by: Alexander van Heukelum <heukelum@xxxxxxxxxxx>
---
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 c17fcc8..535c41a 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -478,14 +478,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);
}
/*
--
1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- [PATCH 4/9] traps: x86_64: make io_check_error equal to the one on i386
- From: Alexander van Heukelum
- [PATCH 4/9] traps: x86_64: make io_check_error equal to the one on i386
- References:
- [PATCH 0/9] traps: x86: finalize unification of traps.c
- From: Alexander van Heukelum
- [PATCH 1/9] traps: x86: converge trap_init functions
- From: Alexander van Heukelum
- [PATCH 2/9] traps: x86_64: make math_state_restore more like i386
- From: Alexander van Heukelum
- [PATCH 0/9] traps: x86: finalize unification of traps.c
- Prev by Date: [PATCH 9/9] traps: x86: finalize unification of traps.c
- Next by Date: Re: [PATCH 1/1] scsi: export busy state via q->lld_busy_fn()
- Previous by thread: [PATCH 2/9] traps: x86_64: make math_state_restore more like i386
- Next by thread: [PATCH 4/9] traps: x86_64: make io_check_error equal to the one on i386
- Index(es):