diff for duplicates of <20050621205405.455437000@linux.jf.intel.com> diff --git a/a/1.txt b/N1/1.txt index dfe7765..103672e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,7 +13,8 @@ signed-off-by: Rusty Lynch <rusty.lynch@intel.com> 1 files changed, 69 insertions(+), 62 deletions(-) Index: linux-2.6.12-mm1/arch/i386/kernel/kprobes.c -=================================--- linux-2.6.12-mm1.orig/arch/i386/kernel/kprobes.c +=================================================================== +--- linux-2.6.12-mm1.orig/arch/i386/kernel/kprobes.c +++ linux-2.6.12-mm1/arch/i386/kernel/kprobes.c @@ -127,48 +127,23 @@ static inline void prepare_singlestep(st regs->eip = (unsigned long)&p->ainsn.insn; @@ -62,7 +63,8 @@ Index: linux-2.6.12-mm1/arch/i386/kernel/kprobes.c -{ - struct kretprobe_instance *ri; - while ((ri = get_rp_inst_tsk(tk)) != NULL) { -- *((unsigned long *)(ri->stack_addr)) - (unsigned long) ri->ret_addr; +- *((unsigned long *)(ri->stack_addr)) = +- (unsigned long) ri->ret_addr; - recycle_rp_inst(ri); - } + add_rp_inst(ri); @@ -86,7 +88,7 @@ Index: linux-2.6.12-mm1/arch/i386/kernel/kprobes.c - head = kretprobe_inst_table_head(tsk); - - hlist_for_each_entry(ri, node, head, hlist) { -- if (ri->stack_addr = sara && ri->rp) { +- if (ri->stack_addr == sara && ri->rp) { - if (ri->rp->handler) - ri->rp->handler(ri, regs); - } @@ -143,7 +145,7 @@ Index: linux-2.6.12-mm1/arch/i386/kernel/kprobes.c } - regs->eflags &= ~TF_MASK; + -+ BUG_ON(!orig_ret_address || (orig_ret_address = trampoline_address)); ++ BUG_ON(!orig_ret_address || (orig_ret_address == trampoline_address)); + regs->eip = orig_ret_address; + + unlock_kprobes(); diff --git a/a/content_digest b/N1/content_digest index 311eb4b..fad46f1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020050621205343.548977000@linux.jf.intel.com\0" "From\0Rusty Lynch <rusty.lynch@intel.com>\0" "Subject\0[patch 2/5] Return probe redesign: i386 specific changes\0" - "Date\0Tue, 21 Jun 2005 20:53:45 +0000\0" + "Date\0Tue, 21 Jun 2005 13:53:45 -0700\0" "To\0akpm@osdl.org\0" "Cc\0linux-kernel@vger.kernel.org" linuxppc64-dev@ozlabs.org @@ -11,6 +11,7 @@ Jim Keniston <jkenisto@us.ibm.com> " Rusty Lynch <rusty.lynch@intel.com>\0" "\00:1\0" + "fn\0kprobes-return-probes-redux-i386.patch\0" "b\0" "The following patch contains the i386 specific changes for the new\n" "return probe design. Changes include:\n" @@ -27,7 +28,8 @@ " 1 files changed, 69 insertions(+), 62 deletions(-)\n" "\n" "Index: linux-2.6.12-mm1/arch/i386/kernel/kprobes.c\n" - "=================================--- linux-2.6.12-mm1.orig/arch/i386/kernel/kprobes.c\n" + "===================================================================\n" + "--- linux-2.6.12-mm1.orig/arch/i386/kernel/kprobes.c\n" "+++ linux-2.6.12-mm1/arch/i386/kernel/kprobes.c\n" "@@ -127,48 +127,23 @@ static inline void prepare_singlestep(st\n" " \t\tregs->eip = (unsigned long)&p->ainsn.insn;\n" @@ -76,7 +78,8 @@ "-{\n" "-\tstruct kretprobe_instance *ri;\n" "-\twhile ((ri = get_rp_inst_tsk(tk)) != NULL) {\n" - "-\t\t*((unsigned long *)(ri->stack_addr)) -\t\t\t\t\t(unsigned long) ri->ret_addr;\n" + "-\t\t*((unsigned long *)(ri->stack_addr)) =\n" + "-\t\t\t\t\t(unsigned long) ri->ret_addr;\n" "-\t\trecycle_rp_inst(ri);\n" "-\t}\n" "+ add_rp_inst(ri);\n" @@ -100,7 +103,7 @@ "-\thead = kretprobe_inst_table_head(tsk);\n" "-\n" "-\thlist_for_each_entry(ri, node, head, hlist) {\n" - "-\t\tif (ri->stack_addr = sara && ri->rp) {\n" + "-\t\tif (ri->stack_addr == sara && ri->rp) {\n" "-\t\t\tif (ri->rp->handler)\n" "-\t\t\t\tri->rp->handler(ri, regs);\n" "-\t\t}\n" @@ -157,7 +160,7 @@ " \t}\n" "-\tregs->eflags &= ~TF_MASK;\n" "+\n" - "+\tBUG_ON(!orig_ret_address || (orig_ret_address = trampoline_address));\n" + "+\tBUG_ON(!orig_ret_address || (orig_ret_address == trampoline_address));\n" "+\tregs->eip = orig_ret_address;\n" "+\n" "+\tunlock_kprobes();\n" @@ -199,4 +202,4 @@ "\n" -- -dd9f0cce2088740524dfa31f1faea2dd962067cc434382926efdfd7a8f921bd3 +188a1b514c47478680aaf619b18e9ae67ccd57610ef91d99b50f5663330e27ca
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.