diff for duplicates of <20050613205235.839201000@linux.jf.intel.com> diff --git a/a/1.txt b/N1/1.txt index c32eb4f..ed5a87b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,8 @@ signed-off-by: Rusty Lynch <Rusty.lynch@intel.com> 1 files changed, 68 insertions(+), 62 deletions(-) Index: linux-2.6.12-rc6-mm1/arch/x86_64/kernel/kprobes.c -=================================--- linux-2.6.12-rc6-mm1.orig/arch/x86_64/kernel/kprobes.c +=================================================================== +--- linux-2.6.12-rc6-mm1.orig/arch/x86_64/kernel/kprobes.c +++ linux-2.6.12-rc6-mm1/arch/x86_64/kernel/kprobes.c @@ -274,48 +274,23 @@ static void prepare_singlestep(struct kp regs->rip = (unsigned long)p->ainsn.insn; @@ -63,7 +64,8 @@ Index: linux-2.6.12-rc6-mm1/arch/x86_64/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); @@ -87,7 +89,7 @@ Index: linux-2.6.12-rc6-mm1/arch/x86_64/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); - } diff --git a/a/content_digest b/N1/content_digest index c1c5d91..a2eaf62 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,12 @@ "ref\020050613205153.349171000@linux.jf.intel.com\0" "From\0rusty.lynch@intel.com\0" "Subject\0[patch 3/5] [kprobes] Tweak to the function return probe design\0" - "Date\0Mon, 13 Jun 2005 20:51:56 +0000\0" + "Date\0Mon, 13 Jun 2005 13:51:56 -0700\0" "To\0linux-ia64@vger.kernel.org" linux-kernel@vger.kernel.org " linuxppc64-dev@ozlabs.org\0" "\00:1\0" + "fn\0kprobes-return-probes-redux-x86_64.patch\0" "b\0" "(The following is a resend from this morning. The various kernel mailing list\n" "did not seem to get my email, so I am resending the patch series from another\n" @@ -23,7 +24,8 @@ " 1 files changed, 68 insertions(+), 62 deletions(-)\n" "\n" "Index: linux-2.6.12-rc6-mm1/arch/x86_64/kernel/kprobes.c\n" - "=================================--- linux-2.6.12-rc6-mm1.orig/arch/x86_64/kernel/kprobes.c\n" + "===================================================================\n" + "--- linux-2.6.12-rc6-mm1.orig/arch/x86_64/kernel/kprobes.c\n" "+++ linux-2.6.12-rc6-mm1/arch/x86_64/kernel/kprobes.c\n" "@@ -274,48 +274,23 @@ static void prepare_singlestep(struct kp\n" " \t\tregs->rip = (unsigned long)p->ainsn.insn;\n" @@ -72,7 +74,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" @@ -96,7 +99,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" @@ -194,4 +197,4 @@ "\n" -- -3e280440e5553de54ff476f7a6df607250d1338e69cafce6e5fcc2c1b667de63 +b8b14840ff87d4820d312b417a54c3425656bf8ee55c63acd8a6c81c16d20f45
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.