---

yaml --- r: 113562 b: refs/heads/master c: 4915a35 h: refs/heads/master v: v3
git-mirror · Oct 13, 2008 · 62e9bd7 · 62e9bd7
1 parent 023cd3f
commit 62e9bd7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 }
 
 /*