[patch 21/26] Immediate Values - Move Kprobes x86 restore_interrupt to kdebug.h

Mathieu Desnoyers
2008-01-24T20:40:58Z

[-- Attachment #1: immediate-values-move-kprobes-x86-restore-interrupt-to-kdebug-h.patch --]
[-- Type: text/plain, Size: 2539 bytes --]

Since the breakpoint handler is useful both to kprobes and immediate values, it
makes sense to make the required restore_interrupt() available through
asm-i386/kdebug.h.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Acked-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
CC: Christoph Hellwig <hch@infradead.org>
CC: anil.s.keshavamurthy@intel.com
CC: davem@davemloft.net
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Ingo Molnar <mingo@redhat.com>
CC: H. Peter Anvin <hpa@zytor.com>
---
include/asm-x86/kdebug.h | 13 +++++++++++++
include/asm-x86/kprobes.h | 9 ---------
2 files changed, 13 insertions(+), 9 deletions(-)

Index: linux-2.6-lttng.mm/include/asm-x86/kdebug.h
===================================================================
--- linux-2.6-lttng.mm.orig/include/asm-x86/kdebug.h 2008-01-24 14:40:49.000000000 -0500
+++ linux-2.6-lttng.mm/include/asm-x86/kdebug.h 2008-01-24 14:41:10.000000000 -0500
@@ -3,6 +3,9 @@

#include <linux/notifier.h>

+#include <linux/ptrace.h>
+#include <asm/system.h>
+
struct pt_regs;

/* Grossly misnamed. */
@@ -36,4 +39,14 @@ extern void dump_pagetable(unsigned long
extern unsigned long oops_begin(void);
extern void oops_end(unsigned long, struct pt_regs *, int signr);

+/*
+ * 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();
+}
+
#endif
Index: linux-2.6-lttng.mm/include/asm-x86/kprobes.h
===================================================================
--- linux-2.6-lttng.mm.orig/include/asm-x86/kprobes.h 2008-01-24 14:41:14.000000000 -0500
+++ linux-2.6-lttng.mm/include/asm-x86/kprobes.h 2008-01-24 14:41:21.000000000 -0500
@@ -83,15 +83,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);