diff for duplicates of <20050616223307.395436000@linux.jf.intel.com> diff --git a/a/1.txt b/N1/1.txt index b5905dc..d87396a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,8 @@ signed-off-by: Rusty Lynch <Rusty.lynch@intel.com> 3 files changed, 125 insertions(+), 7 deletions(-) Index: linux-2.6.12-rc6/arch/ia64/kernel/kprobes.c -=================================--- linux-2.6.12-rc6.orig/arch/ia64/kernel/kprobes.c +=================================================================== +--- linux-2.6.12-rc6.orig/arch/ia64/kernel/kprobes.c +++ linux-2.6.12-rc6/arch/ia64/kernel/kprobes.c @@ -290,6 +290,94 @@ static inline void set_current_kprobe(st current_kprobe = p; @@ -40,7 +41,8 @@ Index: linux-2.6.12-rc6/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); + @@ -77,7 +79,7 @@ Index: linux-2.6.12-rc6/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(); @@ -134,11 +136,13 @@ Index: linux-2.6.12-rc6/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-rc6/include/asm-ia64/kprobes.h -=================================--- linux-2.6.12-rc6.orig/include/asm-ia64/kprobes.h +=================================================================== +--- linux-2.6.12-rc6.orig/include/asm-ia64/kprobes.h +++ linux-2.6.12-rc6/include/asm-ia64/kprobes.h @@ -63,6 +63,8 @@ typedef struct _bundle { @@ -175,7 +179,8 @@ Index: linux-2.6.12-rc6/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-rc6/arch/ia64/kernel/process.c -=================================--- linux-2.6.12-rc6.orig/arch/ia64/kernel/process.c +=================================================================== +--- linux-2.6.12-rc6.orig/arch/ia64/kernel/process.c +++ linux-2.6.12-rc6/arch/ia64/kernel/process.c @@ -27,6 +27,7 @@ #include <linux/efi.h> diff --git a/a/content_digest b/N1/content_digest index 98066e0..ea85cda 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 4/5] [kprobes] Tweak to the function return probe design - take 2\0" - "Date\0Thu, 16 Jun 2005 22:31:43 +0000\0" + "Date\0Thu, 16 Jun 2005 15:31:43 -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-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" @@ -31,7 +32,8 @@ " 3 files changed, 125 insertions(+), 7 deletions(-)\n" "\n" "Index: linux-2.6.12-rc6/arch/ia64/kernel/kprobes.c\n" - "=================================--- linux-2.6.12-rc6.orig/arch/ia64/kernel/kprobes.c\n" + "===================================================================\n" + "--- linux-2.6.12-rc6.orig/arch/ia64/kernel/kprobes.c\n" "+++ linux-2.6.12-rc6/arch/ia64/kernel/kprobes.c\n" "@@ -290,6 +290,94 @@ static inline void set_current_kprobe(st\n" " \tcurrent_kprobe = p;\n" @@ -55,7 +57,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" @@ -92,7 +95,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" @@ -149,11 +152,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-rc6/include/asm-ia64/kprobes.h\n" - "=================================--- linux-2.6.12-rc6.orig/include/asm-ia64/kprobes.h\n" + "===================================================================\n" + "--- linux-2.6.12-rc6.orig/include/asm-ia64/kprobes.h\n" "+++ linux-2.6.12-rc6/include/asm-ia64/kprobes.h\n" "@@ -63,6 +63,8 @@ typedef struct _bundle {\n" " \n" @@ -190,7 +195,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-rc6/arch/ia64/kernel/process.c\n" - "=================================--- linux-2.6.12-rc6.orig/arch/ia64/kernel/process.c\n" + "===================================================================\n" + "--- linux-2.6.12-rc6.orig/arch/ia64/kernel/process.c\n" "+++ linux-2.6.12-rc6/arch/ia64/kernel/process.c\n" "@@ -27,6 +27,7 @@\n" " #include <linux/efi.h>\n" @@ -232,4 +238,4 @@ "\n" -- -4930ac1a19836b997639eeeb3a8c67589af4f01f3c87381e8fd5b2438d4a0806 +a080fb3cf59e4ad72e6b6d276ff6476c12d6fad946144cba9ed894c7ac72369b
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.