diff for duplicates of <20050621205406.996100000@linux.jf.intel.com> diff --git a/a/1.txt b/N1/1.txt index 00f2549..fa54722 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,7 +38,8 @@ signed-off-by: Rusty Lynch <rusty.lynch@intel.com> 3 files changed, 125 insertions(+), 7 deletions(-) Index: linux-2.6.12-mm1/arch/ia64/kernel/kprobes.c -=================================--- linux-2.6.12-mm1.orig/arch/ia64/kernel/kprobes.c +=================================================================== +--- linux-2.6.12-mm1.orig/arch/ia64/kernel/kprobes.c +++ linux-2.6.12-mm1/arch/ia64/kernel/kprobes.c @@ -290,6 +290,94 @@ static inline void set_current_kprobe(st current_kprobe = p; @@ -62,7 +63,8 @@ Index: linux-2.6.12-mm1/arch/ia64/kernel/kprobes.c + struct hlist_head *head; + struct hlist_node *node, *tmp; + unsigned long orig_ret_address = 0; -+ unsigned long trampoline_address + ((struct fnptr *)kretprobe_trampoline)->ip; ++ unsigned long trampoline_address = ++ ((struct fnptr *)kretprobe_trampoline)->ip; + + head = kretprobe_inst_table_head(current); + @@ -99,7 +101,7 @@ Index: linux-2.6.12-mm1/arch/ia64/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->cr_iip = orig_ret_address; + + unlock_kprobes(); @@ -156,11 +158,13 @@ Index: linux-2.6.12-mm1/arch/ia64/kernel/kprobes.c + +int __init arch_init(void) +{ -+ trampoline_p.addr + (kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip; ++ trampoline_p.addr = ++ (kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip; + return register_kprobe(&trampoline_p); +} Index: linux-2.6.12-mm1/include/asm-ia64/kprobes.h -=================================--- linux-2.6.12-mm1.orig/include/asm-ia64/kprobes.h +=================================================================== +--- linux-2.6.12-mm1.orig/include/asm-ia64/kprobes.h +++ linux-2.6.12-mm1/include/asm-ia64/kprobes.h @@ -63,6 +63,8 @@ typedef struct _bundle { @@ -197,7 +201,8 @@ Index: linux-2.6.12-mm1/include/asm-ia64/kprobes.h static inline int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *data) Index: linux-2.6.12-mm1/arch/ia64/kernel/process.c -=================================--- linux-2.6.12-mm1.orig/arch/ia64/kernel/process.c +=================================================================== +--- linux-2.6.12-mm1.orig/arch/ia64/kernel/process.c +++ linux-2.6.12-mm1/arch/ia64/kernel/process.c @@ -27,6 +27,7 @@ #include <linux/efi.h> diff --git a/a/content_digest b/N1/content_digest index 184fcb7..e35f62b 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 4/5] Return probe redesign: ia64 specific implementation\0" - "Date\0Tue, 21 Jun 2005 20:53:47 +0000\0" + "Date\0Tue, 21 Jun 2005 13:53:47 -0700\0" "To\0akpm@osdl.org\0" "Cc\0linux-kernel@vger.kernel.org" linuxppc64-dev@ozlabs.org @@ -10,6 +10,7 @@ Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> " Rusty Lynch <rusty.lynch@intel.com>\0" "\00:1\0" + "fn\0kprobes-return-probes-redux-ia64.patch\0" "b\0" "The following patch implements function return probes for ia64 using\n" "the revised design. With this new design we no longer need to do some\n" @@ -51,7 +52,8 @@ " 3 files changed, 125 insertions(+), 7 deletions(-)\n" "\n" "Index: linux-2.6.12-mm1/arch/ia64/kernel/kprobes.c\n" - "=================================--- linux-2.6.12-mm1.orig/arch/ia64/kernel/kprobes.c\n" + "===================================================================\n" + "--- linux-2.6.12-mm1.orig/arch/ia64/kernel/kprobes.c\n" "+++ linux-2.6.12-mm1/arch/ia64/kernel/kprobes.c\n" "@@ -290,6 +290,94 @@ static inline void set_current_kprobe(st\n" " \tcurrent_kprobe = p;\n" @@ -75,7 +77,8 @@ "+\tstruct hlist_head *head;\n" "+\tstruct hlist_node *node, *tmp;\n" "+\tunsigned long orig_ret_address = 0;\n" - "+\tunsigned long trampoline_address +\t\t((struct fnptr *)kretprobe_trampoline)->ip;\n" + "+\tunsigned long trampoline_address =\n" + "+\t\t((struct fnptr *)kretprobe_trampoline)->ip;\n" "+\n" "+ head = kretprobe_inst_table_head(current);\n" "+\n" @@ -112,7 +115,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->cr_iip = orig_ret_address;\n" "+\n" "+\tunlock_kprobes();\n" @@ -169,11 +172,13 @@ "+\n" "+int __init arch_init(void)\n" "+{\n" - "+\ttrampoline_p.addr +\t\t(kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip;\n" + "+\ttrampoline_p.addr =\n" + "+\t\t(kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip;\n" "+\treturn register_kprobe(&trampoline_p);\n" "+}\n" "Index: linux-2.6.12-mm1/include/asm-ia64/kprobes.h\n" - "=================================--- linux-2.6.12-mm1.orig/include/asm-ia64/kprobes.h\n" + "===================================================================\n" + "--- linux-2.6.12-mm1.orig/include/asm-ia64/kprobes.h\n" "+++ linux-2.6.12-mm1/include/asm-ia64/kprobes.h\n" "@@ -63,6 +63,8 @@ typedef struct _bundle {\n" " \n" @@ -210,7 +215,8 @@ " static inline int kprobe_exceptions_notify(struct notifier_block *self,\n" " \t\t\t\t\t unsigned long val, void *data)\n" "Index: linux-2.6.12-mm1/arch/ia64/kernel/process.c\n" - "=================================--- linux-2.6.12-mm1.orig/arch/ia64/kernel/process.c\n" + "===================================================================\n" + "--- linux-2.6.12-mm1.orig/arch/ia64/kernel/process.c\n" "+++ linux-2.6.12-mm1/arch/ia64/kernel/process.c\n" "@@ -27,6 +27,7 @@\n" " #include <linux/efi.h>\n" @@ -252,4 +258,4 @@ "\n" -- -d3659812d78ae889edad5f2c52e4e9a5dece8f03815cb17f04e37b24ed09a522 +3d972b540bc6cd90f6044d13d5d2846b86a1f1d295df9cbaa69ced8f463964f8
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.