diff for duplicates of <20050613205236.873920000@linux.jf.intel.com> diff --git a/a/1.txt b/N1/1.txt index 735672a..46b4b7e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,8 @@ NOTE: Since getting Ananth's patch, I changed trampoline_probe_handler() 3 files changed, 105 insertions(+) Index: linux-2.6.12-rc6-mm1/arch/ppc64/kernel/kprobes.c -=================================--- linux-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/kprobes.c +=================================================================== +--- linux-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/kprobes.c +++ linux-2.6.12-rc6-mm1/arch/ppc64/kernel/kprobes.c @@ -100,6 +100,23 @@ static inline void restore_previous_kpro kprobe_saved_msr = kprobe_saved_msr_prev; @@ -138,7 +139,8 @@ Index: linux-2.6.12-rc6-mm1/arch/ppc64/kernel/kprobes.c + return register_kprobe(&trampoline_p); +} Index: linux-2.6.12-rc6-mm1/arch/ppc64/kernel/process.c -=================================--- linux-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/process.c +=================================================================== +--- linux-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/process.c +++ linux-2.6.12-rc6-mm1/arch/ppc64/kernel/process.c @@ -37,6 +37,7 @@ #include <linux/interrupt.h> @@ -155,7 +157,7 @@ Index: linux-2.6.12-rc6-mm1/arch/ppc64/kernel/process.c + kprobe_flush_task(current); + #ifndef CONFIG_SMP - if (last_task_used_math = current) + if (last_task_used_math == current) last_task_used_math = NULL; @@ -325,6 +328,7 @@ void flush_thread(void) { @@ -166,7 +168,8 @@ Index: linux-2.6.12-rc6-mm1/arch/ppc64/kernel/process.c t->flags ^= (_TIF_ABI_PENDING | _TIF_32BIT); Index: linux-2.6.12-rc6-mm1/include/asm-ppc64/kprobes.h -=================================--- linux-2.6.12-rc6-mm1.orig/include/asm-ppc64/kprobes.h +=================================================================== +--- linux-2.6.12-rc6-mm1.orig/include/asm-ppc64/kprobes.h +++ linux-2.6.12-rc6-mm1/include/asm-ppc64/kprobes.h @@ -42,6 +42,9 @@ typedef unsigned int kprobe_opcode_t; diff --git a/a/content_digest b/N1/content_digest index 58df571..9a0f344 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 5/5] [kprobes] Tweak to the function return probe design\0" - "Date\0Mon, 13 Jun 2005 20:51:58 +0000\0" + "Date\0Mon, 13 Jun 2005 13:51:58 -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-ppc64.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" @@ -28,7 +29,8 @@ " 3 files changed, 105 insertions(+)\n" "\n" "Index: linux-2.6.12-rc6-mm1/arch/ppc64/kernel/kprobes.c\n" - "=================================--- linux-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/kprobes.c\n" + "===================================================================\n" + "--- linux-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/kprobes.c\n" "+++ linux-2.6.12-rc6-mm1/arch/ppc64/kernel/kprobes.c\n" "@@ -100,6 +100,23 @@ static inline void restore_previous_kpro\n" " \tkprobe_saved_msr = kprobe_saved_msr_prev;\n" @@ -147,7 +149,8 @@ "+\treturn register_kprobe(&trampoline_p);\n" "+}\n" "Index: linux-2.6.12-rc6-mm1/arch/ppc64/kernel/process.c\n" - "=================================--- linux-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/process.c\n" + "===================================================================\n" + "--- linux-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/process.c\n" "+++ linux-2.6.12-rc6-mm1/arch/ppc64/kernel/process.c\n" "@@ -37,6 +37,7 @@\n" " #include <linux/interrupt.h>\n" @@ -164,7 +167,7 @@ "+\tkprobe_flush_task(current);\n" "+\n" " #ifndef CONFIG_SMP\n" - " \tif (last_task_used_math = current)\n" + " \tif (last_task_used_math == current)\n" " \t\tlast_task_used_math = NULL;\n" "@@ -325,6 +328,7 @@ void flush_thread(void)\n" " {\n" @@ -175,7 +178,8 @@ " \t\tt->flags ^= (_TIF_ABI_PENDING | _TIF_32BIT);\n" " \n" "Index: linux-2.6.12-rc6-mm1/include/asm-ppc64/kprobes.h\n" - "=================================--- linux-2.6.12-rc6-mm1.orig/include/asm-ppc64/kprobes.h\n" + "===================================================================\n" + "--- linux-2.6.12-rc6-mm1.orig/include/asm-ppc64/kprobes.h\n" "+++ linux-2.6.12-rc6-mm1/include/asm-ppc64/kprobes.h\n" "@@ -42,6 +42,9 @@ typedef unsigned int kprobe_opcode_t;\n" " \n" @@ -190,4 +194,4 @@ "\n" -- -300e0baf1dad6097ddb6ab5605ba4eb92d88e4754c13351b0e08c9089ad78054 +dc00f8416341ab5553c1eeb1634443267b5c029d2838041f909a7d456d9c6a37
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.