diff for duplicates of <20050616223308.007672000@linux.jf.intel.com> diff --git a/a/1.txt b/N1/1.txt index 4dabe2b..c8a9b2f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,7 +17,8 @@ signed-off-by: Rusty Lynch <Rusty.lynch@intel.com> 3 files changed, 106 insertions(+) Index: ppc64-2.6.12-rc6-mm1/arch/ppc64/kernel/kprobes.c -=================================--- ppc64-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/kprobes.c +=================================================================== +--- ppc64-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/kprobes.c +++ ppc64-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; @@ -105,7 +106,7 @@ Index: ppc64-2.6.12-rc6-mm1/arch/ppc64/kernel/kprobes.c + break; + } + -+ BUG_ON(!orig_ret_address || (orig_ret_address = trampoline_address)); ++ BUG_ON(!orig_ret_address || (orig_ret_address == trampoline_address)); + regs->nip = orig_ret_address; + + unlock_kprobes(); @@ -137,7 +138,8 @@ Index: ppc64-2.6.12-rc6-mm1/arch/ppc64/kernel/kprobes.c + return register_kprobe(&trampoline_p); +} Index: ppc64-2.6.12-rc6-mm1/arch/ppc64/kernel/process.c -=================================--- ppc64-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/process.c +=================================================================== +--- ppc64-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/process.c +++ ppc64-2.6.12-rc6-mm1/arch/ppc64/kernel/process.c @@ -37,6 +37,7 @@ #include <linux/interrupt.h> @@ -154,7 +156,7 @@ Index: ppc64-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) { @@ -165,7 +167,8 @@ Index: ppc64-2.6.12-rc6-mm1/arch/ppc64/kernel/process.c t->flags ^= (_TIF_ABI_PENDING | _TIF_32BIT); Index: ppc64-2.6.12-rc6-mm1/include/asm-ppc64/kprobes.h -=================================--- ppc64-2.6.12-rc6-mm1.orig/include/asm-ppc64/kprobes.h +=================================================================== +--- ppc64-2.6.12-rc6-mm1.orig/include/asm-ppc64/kprobes.h +++ ppc64-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 837cc02..aef5058 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020050616223139.444305000@linux.jf.intel.com\0" "From\0rusty.lynch@intel.com\0" "Subject\0[patch 5/5] [kprobes] Tweak to the function return probe design - take 2\0" - "Date\0Thu, 16 Jun 2005 22:31:44 +0000\0" + "Date\0Thu, 16 Jun 2005 15:31:44 -0700\0" "To\0akpm@osdl.org\0" "Cc\0systemtap@sources.redhat.com" linux-ia64@vger.kernel.org @@ -12,6 +12,7 @@ Ananth N Mavinakayanahalli <amavin@redhat.com> " linuxppc64-dev@ozlabs.org\0" "\00:1\0" + "fn\0kprobes-return-probes-redux-ppc64.patch\0" "b\0" "The following is a patch provided by Ananth Mavinakayanahalli that implements\n" "the new PPC64 specific parts of the new function return probe design. \n" @@ -32,7 +33,8 @@ " 3 files changed, 106 insertions(+)\n" "\n" "Index: ppc64-2.6.12-rc6-mm1/arch/ppc64/kernel/kprobes.c\n" - "=================================--- ppc64-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/kprobes.c\n" + "===================================================================\n" + "--- ppc64-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/kprobes.c\n" "+++ ppc64-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" @@ -120,7 +122,7 @@ "+\t\t\tbreak;\n" "+\t}\n" "+\n" - "+\tBUG_ON(!orig_ret_address || (orig_ret_address = trampoline_address));\n" + "+\tBUG_ON(!orig_ret_address || (orig_ret_address == trampoline_address));\n" "+\tregs->nip = orig_ret_address;\n" "+\n" "+\tunlock_kprobes();\n" @@ -152,7 +154,8 @@ "+\treturn register_kprobe(&trampoline_p);\n" "+}\n" "Index: ppc64-2.6.12-rc6-mm1/arch/ppc64/kernel/process.c\n" - "=================================--- ppc64-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/process.c\n" + "===================================================================\n" + "--- ppc64-2.6.12-rc6-mm1.orig/arch/ppc64/kernel/process.c\n" "+++ ppc64-2.6.12-rc6-mm1/arch/ppc64/kernel/process.c\n" "@@ -37,6 +37,7 @@\n" " #include <linux/interrupt.h>\n" @@ -169,7 +172,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" @@ -180,7 +183,8 @@ " \t\tt->flags ^= (_TIF_ABI_PENDING | _TIF_32BIT);\n" " \n" "Index: ppc64-2.6.12-rc6-mm1/include/asm-ppc64/kprobes.h\n" - "=================================--- ppc64-2.6.12-rc6-mm1.orig/include/asm-ppc64/kprobes.h\n" + "===================================================================\n" + "--- ppc64-2.6.12-rc6-mm1.orig/include/asm-ppc64/kprobes.h\n" "+++ ppc64-2.6.12-rc6-mm1/include/asm-ppc64/kprobes.h\n" "@@ -42,6 +42,9 @@ typedef unsigned int kprobe_opcode_t;\n" " \n" @@ -195,4 +199,4 @@ "\n" -- -5f6a915016b29d62ce82068acc16db90c7d790376b100bd432f57c4ee48a3c3e +ae8c7fbb8a39db11c9ca0669090f6fb3ed5c0f63f7a72acdb3edc876f09c0b55
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.