Immediate Values - Move Kprobes i386 restore_interrupt to kdebug.h 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.
This patch replaces "immediate-values-kprobes-headers.patch". Signed-off-by: Mathieu Desnoyers <[EMAIL PROTECTED]> CC: Christoph Hellwig <[EMAIL PROTECTED]> CC: [EMAIL PROTECTED] CC: [EMAIL PROTECTED] CC: [EMAIL PROTECTED] CC: [EMAIL PROTECTED] --- include/asm-i386/kdebug.h | 10 ++++++++++ include/asm-i386/kprobes.h | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) Index: linux-2.6-lttng/include/asm-i386/kdebug.h =================================================================== --- linux-2.6-lttng.orig/include/asm-i386/kdebug.h 2007-07-14 18:32:56.000000000 -0400 +++ linux-2.6-lttng/include/asm-i386/kdebug.h 2007-07-14 18:37:32.000000000 -0400 @@ -6,6 +6,7 @@ * from x86_64 architecture. */ #include <linux/notifier.h> +#include <asm/ptrace.h> struct pt_regs; @@ -31,4 +32,13 @@ enum die_val { DIE_PAGE_FAULT_NO_CONTEXT, }; +/* 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->eflags & IF_MASK) + local_irq_enable(); +} + #endif Index: linux-2.6-lttng/include/asm-i386/kprobes.h =================================================================== --- linux-2.6-lttng.orig/include/asm-i386/kprobes.h 2007-07-14 18:32:52.000000000 -0400 +++ linux-2.6-lttng/include/asm-i386/kprobes.h 2007-07-14 18:33:59.000000000 -0400 @@ -80,15 +80,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->eflags & IF_MASK) - local_irq_enable(); -} - extern int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *data); extern int kernel_text_is_ro; -- 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 [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/