From 62e9bd7eea2f14e0bc506399992cf8cd3d604d65 Mon Sep 17 00:00:00 2001 From: Alexander van Heukelum Date: Fri, 3 Oct 2008 22:00:34 +0200 Subject: [PATCH] --- yaml --- r: 113562 b: refs/heads/master c: 4915a35e35a037254550a2ba9f367a812bc37d40 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/traps_32.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 393caabd5268..dc59fc406efb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 091d30c8f7744f43b0bb507fd30ceb95f9ff9e1b +refs/heads/master: 4915a35e35a037254550a2ba9f367a812bc37d40 diff --git a/trunk/arch/x86/kernel/traps_32.c b/trunk/arch/x86/kernel/traps_32.c index 2c7ea3827713..67953bbe193d 100644 --- a/trunk/arch/x86/kernel/traps_32.c +++ b/trunk/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); } /*