From 29dc52904823ae856cf4f999d844b01fcec2827e Mon Sep 17 00:00:00 2001
From: Alexander van Heukelum <heukelum@fastmail.fm>
Date: Tue, 9 Sep 2008 21:55:55 +0200
Subject: [PATCH] --- yaml --- r: 113488 b: refs/heads/master c:
 762db4347060c5d23e9675846e02f7d95d7f944f h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/traps_32.c | 8 +++++++-
 trunk/include/asm-x86/kprobes.h  | 9 ---------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 4b51d9eb794e..dcee9cc4b4bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 927604c7592473742891dc13e1da09febc06e01b
+refs/heads/master: 762db4347060c5d23e9675846e02f7d95d7f944f
diff --git a/trunk/arch/x86/kernel/traps_32.c b/trunk/arch/x86/kernel/traps_32.c
index 0429c5de5ea9..203b863ac2a8 100644
--- a/trunk/arch/x86/kernel/traps_32.c
+++ b/trunk/arch/x86/kernel/traps_32.c
@@ -84,6 +84,12 @@ static unsigned int code_bytes = 64;
 static int ignore_nmis;
 static int die_counter;
 
+static inline void conditional_sti(struct pt_regs *regs)
+{
+	if (regs->flags & X86_EFLAGS_IF)
+		local_irq_enable();
+}
+
 void printk_address(unsigned long address, int reliable)
 {
 #ifdef CONFIG_KALLSYMS
@@ -859,7 +865,7 @@ void __kprobes do_int3(struct pt_regs *regs, long error_code)
 	 * This is an interrupt gate, because kprobes wants interrupts
 	 * disabled. Normal trap handlers don't.
 	 */
-	restore_interrupts(regs);
+	conditional_sti(regs);
 
 	do_trap(3, SIGTRAP, "int3", 1, regs, error_code, NULL);
 }
diff --git a/trunk/include/asm-x86/kprobes.h b/trunk/include/asm-x86/kprobes.h
index bd8407863c13..8a0748d01036 100644
--- a/trunk/include/asm-x86/kprobes.h
+++ b/trunk/include/asm-x86/kprobes.h
@@ -82,15 +82,6 @@ struct kprobe_ctlblk {
 	struct prev_kprobe prev_kprobe;
 };
 
-/* trap3/1 are intr gates for kprobes.  So, restore the status of IF,
- * if necessary, before executing the original int3/1 (trap) handler.
- */
-static inline void restore_interrupts(struct pt_regs *regs)
-{
-	if (regs->flags & X86_EFLAGS_IF)
-		local_irq_enable();
-}
-
 extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
 extern int kprobe_exceptions_notify(struct notifier_block *self,
 				    unsigned long val, void *data);