diff for duplicates of <20050613205234.799275000@linux.jf.intel.com> diff --git a/a/1.txt b/N1/1.txt index ac13322..74aa2b9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,8 @@ signed-off-by: Rusty Lynch <Rusty.lynch@intel.com> 2 files changed, 22 insertions(+), 75 deletions(-) Index: linux-2.6.12-rc6/include/linux/kprobes.h -=================================--- linux-2.6.12-rc6.orig/include/linux/kprobes.h +=================================================================== +--- linux-2.6.12-rc6.orig/include/linux/kprobes.h +++ linux-2.6.12-rc6/include/linux/kprobes.h @@ -104,33 +104,12 @@ struct jprobe { }; @@ -79,7 +80,8 @@ Index: linux-2.6.12-rc6/include/linux/kprobes.h void kprobe_flush_task(struct task_struct *tk); void recycle_rp_inst(struct kretprobe_instance *ri); Index: linux-2.6.12-rc6/kernel/kprobes.c -=================================--- linux-2.6.12-rc6.orig/kernel/kprobes.c +=================================================================== +--- linux-2.6.12-rc6.orig/kernel/kprobes.c +++ linux-2.6.12-rc6/kernel/kprobes.c @@ -138,12 +138,6 @@ static int aggr_break_handler(struct kpr return 0; @@ -108,7 +110,7 @@ Index: linux-2.6.12-rc6/kernel/kprobes.c - tsk = arch_get_kprobe_task(sara); - head = &kretprobe_inst_table[hash_ptr(tsk, KPROBE_HASH_BITS)]; - hlist_for_each_entry(ri, node, head, hlist) { -- if (ri->stack_addr = sara) +- if (ri->stack_addr == sara) - return ri; - } - return NULL; @@ -147,7 +149,7 @@ Index: linux-2.6.12-rc6/kernel/kprobes.c - - hlist_for_each_entry(ri, node, head, hlist) { - tsk = arch_get_kprobe_task(ri->stack_addr); -- if (tsk = tk) +- if (tsk == tk) - return ri; - } - return NULL; @@ -174,7 +176,7 @@ Index: linux-2.6.12-rc6/kernel/kprobes.c - arch_kprobe_flush_task(tk); + head = kretprobe_inst_table_head(current); + hlist_for_each_entry_safe(ri, node, tmp, head, hlist) { -+ if (ri->task = tk) ++ if (ri->task == tk) + recycle_rp_inst(ri); + } spin_unlock_irqrestore(&kprobe_lock, flags); diff --git a/a/content_digest b/N1/content_digest index e2f199c..de2dbcf 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 1/5] [kprobes] Tweak to the function return probe design\0" - "Date\0Mon, 13 Jun 2005 20:51:54 +0000\0" + "Date\0Mon, 13 Jun 2005 13:51:54 -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-base.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 @@ " 2 files changed, 22 insertions(+), 75 deletions(-)\n" "\n" "Index: linux-2.6.12-rc6/include/linux/kprobes.h\n" - "=================================--- linux-2.6.12-rc6.orig/include/linux/kprobes.h\n" + "===================================================================\n" + "--- linux-2.6.12-rc6.orig/include/linux/kprobes.h\n" "+++ linux-2.6.12-rc6/include/linux/kprobes.h\n" "@@ -104,33 +104,12 @@ struct jprobe {\n" " };\n" @@ -88,7 +90,8 @@ " void kprobe_flush_task(struct task_struct *tk);\n" " void recycle_rp_inst(struct kretprobe_instance *ri);\n" "Index: linux-2.6.12-rc6/kernel/kprobes.c\n" - "=================================--- linux-2.6.12-rc6.orig/kernel/kprobes.c\n" + "===================================================================\n" + "--- linux-2.6.12-rc6.orig/kernel/kprobes.c\n" "+++ linux-2.6.12-rc6/kernel/kprobes.c\n" "@@ -138,12 +138,6 @@ static int aggr_break_handler(struct kpr\n" " \treturn 0;\n" @@ -117,7 +120,7 @@ "-\ttsk = arch_get_kprobe_task(sara);\n" "-\thead = &kretprobe_inst_table[hash_ptr(tsk, KPROBE_HASH_BITS)];\n" "-\thlist_for_each_entry(ri, node, head, hlist) {\n" - "-\t\tif (ri->stack_addr = sara)\n" + "-\t\tif (ri->stack_addr == sara)\n" "-\t\t\treturn ri;\n" "-\t}\n" "-\treturn NULL;\n" @@ -156,7 +159,7 @@ "-\n" "-\thlist_for_each_entry(ri, node, head, hlist) {\n" "-\t\ttsk = arch_get_kprobe_task(ri->stack_addr);\n" - "-\t\tif (tsk = tk)\n" + "-\t\tif (tsk == tk)\n" "-\t\t\treturn ri;\n" "-\t}\n" "-\treturn NULL;\n" @@ -183,7 +186,7 @@ "-\tarch_kprobe_flush_task(tk);\n" "+ head = kretprobe_inst_table_head(current);\n" "+ hlist_for_each_entry_safe(ri, node, tmp, head, hlist) {\n" - "+ if (ri->task = tk)\n" + "+ if (ri->task == tk)\n" "+ recycle_rp_inst(ri);\n" "+ }\n" " \tspin_unlock_irqrestore(&kprobe_lock, flags);\n" @@ -206,4 +209,4 @@ "\n" -- -0f169e19b7add884dff8e2f76a11392ed38078e2a4107e4d6a420cc1f56838d2 +0e0ae08e11f3348dd63db9979322d7910d3c45264b88ac8b1fc0057d69544226
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.