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 Acked-by: Ananth N Mavinakayanahalli CC: Christoph Hellwig CC: anil.s.keshavamurthy@intel.com CC: davem@davemloft.net CC: Thomas Gleixner CC: Ingo Molnar CC: H. Peter Anvin --- include/asm-x86/kdebug.h | 12 ++++++++++++ include/asm-x86/kprobes.h | 9 --------- 2 files changed, 12 insertions(+), 9 deletions(-) Index: linux-2.6-lttng/include/asm-x86/kdebug.h =================================================================== --- linux-2.6-lttng.orig/include/asm-x86/kdebug.h 2008-03-25 08:56:54.000000000 -0400 +++ linux-2.6-lttng/include/asm-x86/kdebug.h 2008-03-25 09:00:17.000000000 -0400 @@ -3,6 +3,9 @@ #include +#include +#include + struct pt_regs; /* Grossly misnamed. */ @@ -34,4 +37,13 @@ extern void show_regs(struct pt_regs *re 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/include/asm-x86/kprobes.h =================================================================== --- linux-2.6-lttng.orig/include/asm-x86/kprobes.h 2008-03-25 08:56:54.000000000 -0400 +++ linux-2.6-lttng/include/asm-x86/kprobes.h 2008-03-25 09:00:17.000000000 -0400 @@ -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); -- Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/