diff for duplicates of <20050621205404.856940000@linux.jf.intel.com> diff --git a/a/1.txt b/N1/1.txt index 83b35e9..f07c7b0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,7 +18,8 @@ signed-off-by: Rusty Lynch <rusty.lynch@intel.com> 2 files changed, 22 insertions(+), 75 deletions(-) Index: linux-2.6.12-mm1/include/linux/kprobes.h -=================================--- linux-2.6.12-mm1.orig/include/linux/kprobes.h +=================================================================== +--- linux-2.6.12-mm1.orig/include/linux/kprobes.h +++ linux-2.6.12-mm1/include/linux/kprobes.h @@ -104,33 +104,12 @@ struct jprobe { }; @@ -83,7 +84,8 @@ Index: linux-2.6.12-mm1/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-mm1/kernel/kprobes.c -=================================--- linux-2.6.12-mm1.orig/kernel/kprobes.c +=================================================================== +--- linux-2.6.12-mm1.orig/kernel/kprobes.c +++ linux-2.6.12-mm1/kernel/kprobes.c @@ -139,12 +139,6 @@ static int aggr_break_handler(struct kpr return 0; @@ -112,7 +114,7 @@ Index: linux-2.6.12-mm1/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; @@ -151,7 +153,7 @@ Index: linux-2.6.12-mm1/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; @@ -178,7 +180,7 @@ Index: linux-2.6.12-mm1/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 f50136f..032fecc 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 1/5] Return probe redesign: architecture independant changes\0" - "Date\0Tue, 21 Jun 2005 20:53:44 +0000\0" + "Date\0Tue, 21 Jun 2005 13:53:44 -0700\0" "To\0akpm@osdl.org\0" "Cc\0linux-kernel@vger.kernel.org" linuxppc64-dev@ozlabs.org @@ -11,6 +11,7 @@ Hien Nguyen <hien@us.ibm.com> " Jim Keniston <jkenisto@us.ibm.com>\0" "\00:1\0" + "fn\0kprobes-return-probes-redux-base.patch\0" "b\0" "This patch implements the architecture independant changes for a reworking\n" "of the kprobes based function return probes design. Changes include:\n" @@ -32,7 +33,8 @@ " 2 files changed, 22 insertions(+), 75 deletions(-)\n" "\n" "Index: linux-2.6.12-mm1/include/linux/kprobes.h\n" - "=================================--- linux-2.6.12-mm1.orig/include/linux/kprobes.h\n" + "===================================================================\n" + "--- linux-2.6.12-mm1.orig/include/linux/kprobes.h\n" "+++ linux-2.6.12-mm1/include/linux/kprobes.h\n" "@@ -104,33 +104,12 @@ struct jprobe {\n" " };\n" @@ -97,7 +99,8 @@ " void kprobe_flush_task(struct task_struct *tk);\n" " void recycle_rp_inst(struct kretprobe_instance *ri);\n" "Index: linux-2.6.12-mm1/kernel/kprobes.c\n" - "=================================--- linux-2.6.12-mm1.orig/kernel/kprobes.c\n" + "===================================================================\n" + "--- linux-2.6.12-mm1.orig/kernel/kprobes.c\n" "+++ linux-2.6.12-mm1/kernel/kprobes.c\n" "@@ -139,12 +139,6 @@ static int aggr_break_handler(struct kpr\n" " \treturn 0;\n" @@ -126,7 +129,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" @@ -165,7 +168,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" @@ -192,7 +195,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" @@ -215,4 +218,4 @@ "\n" -- -25cb88657cbd1758e2ed8b1a6841505a3c39be05eadb8c70fe62c92ff394c74c +60f4f8457fa50e9116f5e22aac7aa473333714f7e914c969799da61c899eca40
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.