diff for duplicates of <20050613205235.308105000@linux.jf.intel.com> diff --git a/a/1.txt b/N1/1.txt index 0c056e9..5ba0200 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,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/i386/kernel/kprobes.c -=================================--- linux-2.6.12-rc6-mm1.orig/arch/i386/kernel/kprobes.c +=================================================================== +--- linux-2.6.12-rc6-mm1.orig/arch/i386/kernel/kprobes.c +++ linux-2.6.12-rc6-mm1/arch/i386/kernel/kprobes.c @@ -127,48 +127,23 @@ static inline void prepare_singlestep(st regs->eip = (unsigned long)&p->ainsn.insn; @@ -60,7 +61,8 @@ Index: linux-2.6.12-rc6-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); @@ -84,7 +86,7 @@ Index: linux-2.6.12-rc6-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); - } diff --git a/a/content_digest b/N1/content_digest index cca7fba..21bb3b6 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 2/5] [kprobes] Tweak to the function return probe design\0" - "Date\0Mon, 13 Jun 2005 20:51:55 +0000\0" + "Date\0Mon, 13 Jun 2005 13:51:55 -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-i386.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" @@ -20,7 +21,8 @@ " 1 files changed, 68 insertions(+), 62 deletions(-)\n" "\n" "Index: linux-2.6.12-rc6-mm1/arch/i386/kernel/kprobes.c\n" - "=================================--- linux-2.6.12-rc6-mm1.orig/arch/i386/kernel/kprobes.c\n" + "===================================================================\n" + "--- linux-2.6.12-rc6-mm1.orig/arch/i386/kernel/kprobes.c\n" "+++ linux-2.6.12-rc6-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" @@ -69,7 +71,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" @@ -93,7 +96,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" @@ -191,4 +194,4 @@ "\n" -- -adb70cd81a76dd9683b54b70dbf18ee4da2f5ddb94c648324bdd8e0999568d25 +c004f26c850414190b59f8ab7c96218fbcf08ec150343f199f581ebc2762169f
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.