diff for duplicates of <20050621205407.571189000@linux.jf.intel.com> diff --git a/a/1.txt b/N1/1.txt index c29cf4c..47bb206 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,7 +34,8 @@ signed-off-by: Rusty Lynch <rusty.lynch@intel.com> 3 files changed, 106 insertions(+) Index: linux-2.6.12-mm1/arch/ppc64/kernel/kprobes.c -=================================--- linux-2.6.12-mm1.orig/arch/ppc64/kernel/kprobes.c +=================================================================== +--- linux-2.6.12-mm1.orig/arch/ppc64/kernel/kprobes.c +++ linux-2.6.12-mm1/arch/ppc64/kernel/kprobes.c @@ -105,6 +105,23 @@ static inline void restore_previous_kpro kprobe_saved_msr = kprobe_saved_msr_prev; @@ -122,7 +123,7 @@ Index: linux-2.6.12-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(); @@ -154,7 +155,8 @@ Index: linux-2.6.12-mm1/arch/ppc64/kernel/kprobes.c + return register_kprobe(&trampoline_p); +} Index: linux-2.6.12-mm1/arch/ppc64/kernel/process.c -=================================--- linux-2.6.12-mm1.orig/arch/ppc64/kernel/process.c +=================================================================== +--- linux-2.6.12-mm1.orig/arch/ppc64/kernel/process.c +++ linux-2.6.12-mm1/arch/ppc64/kernel/process.c @@ -37,6 +37,7 @@ #include <linux/interrupt.h> @@ -171,7 +173,7 @@ Index: linux-2.6.12-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) { @@ -182,7 +184,8 @@ Index: linux-2.6.12-mm1/arch/ppc64/kernel/process.c t->flags ^= (_TIF_ABI_PENDING | _TIF_32BIT); Index: linux-2.6.12-mm1/include/asm-ppc64/kprobes.h -=================================--- linux-2.6.12-mm1.orig/include/asm-ppc64/kprobes.h +=================================================================== +--- linux-2.6.12-mm1.orig/include/asm-ppc64/kprobes.h +++ linux-2.6.12-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 e949b84..8506920 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 5/5] Return probe redesign: ppc64 specific implementation\0" - "Date\0Tue, 21 Jun 2005 20:53:48 +0000\0" + "Date\0Tue, 21 Jun 2005 13:53:48 -0700\0" "To\0akpm@osdl.org\0" "Cc\0linux-kernel@vger.kernel.org" linuxppc64-dev@ozlabs.org @@ -9,6 +9,7 @@ Ananth N Mavinakayanahali <ananth@in.ibm.com> " Rusty Lynch <rusty.lynch@intel.com>\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" @@ -46,7 +47,8 @@ " 3 files changed, 106 insertions(+)\n" "\n" "Index: linux-2.6.12-mm1/arch/ppc64/kernel/kprobes.c\n" - "=================================--- linux-2.6.12-mm1.orig/arch/ppc64/kernel/kprobes.c\n" + "===================================================================\n" + "--- linux-2.6.12-mm1.orig/arch/ppc64/kernel/kprobes.c\n" "+++ linux-2.6.12-mm1/arch/ppc64/kernel/kprobes.c\n" "@@ -105,6 +105,23 @@ static inline void restore_previous_kpro\n" " \tkprobe_saved_msr = kprobe_saved_msr_prev;\n" @@ -134,7 +136,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" @@ -166,7 +168,8 @@ "+\treturn register_kprobe(&trampoline_p);\n" "+}\n" "Index: linux-2.6.12-mm1/arch/ppc64/kernel/process.c\n" - "=================================--- linux-2.6.12-mm1.orig/arch/ppc64/kernel/process.c\n" + "===================================================================\n" + "--- linux-2.6.12-mm1.orig/arch/ppc64/kernel/process.c\n" "+++ linux-2.6.12-mm1/arch/ppc64/kernel/process.c\n" "@@ -37,6 +37,7 @@\n" " #include <linux/interrupt.h>\n" @@ -183,7 +186,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" @@ -194,7 +197,8 @@ " \t\tt->flags ^= (_TIF_ABI_PENDING | _TIF_32BIT);\n" " \n" "Index: linux-2.6.12-mm1/include/asm-ppc64/kprobes.h\n" - "=================================--- linux-2.6.12-mm1.orig/include/asm-ppc64/kprobes.h\n" + "===================================================================\n" + "--- linux-2.6.12-mm1.orig/include/asm-ppc64/kprobes.h\n" "+++ linux-2.6.12-mm1/include/asm-ppc64/kprobes.h\n" "@@ -42,6 +42,9 @@ typedef unsigned int kprobe_opcode_t;\n" " \n" @@ -209,4 +213,4 @@ "\n" -- -19e7814a92a5c658fff089f68b1fb2c1116567164e842621b4a4c11894514665 +532027d7a79c353ec63c238311b95291e2d698edf4d52e548d584a086eb51060
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.