diff for duplicates of <20050613205236.351353000@linux.jf.intel.com> diff --git a/a/1.txt b/N1/1.txt index 8750e4f..d5c3ffb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,7 +20,8 @@ signed-off-by: Rusty Lynch <Rusty.lynch@intel.com> 3 files changed, 118 insertions(+), 2 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,93 @@ static inline void set_current_kprobe(st current_kprobe = p; @@ -71,7 +72,8 @@ Index: linux-2.6.12-rc6/arch/ia64/kernel/kprobes.c + orig_ret_address = (unsigned long)ri->ret_addr; + recycle_rp_inst(ri); + -+ if (orig_ret_address !+ ((struct fnptr *)kretprobe_trampoline)->ip) ++ if (orig_ret_address != ++ ((struct fnptr *)kretprobe_trampoline)->ip) + /* + * This is the real return address. Any other + * instances associated with this task are for @@ -137,11 +139,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 { @@ -153,7 +157,8 @@ Index: linux-2.6.12-rc6/include/asm-ia64/kprobes.h #define SLOT1_p1_OPCODE_SHIFT (37 - (64-46)) #define SLOT2_OPCODE_SHIFT (37) 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 2c29d72..14d054c 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 4/5] [kprobes] Tweak to the function return probe design\0" - "Date\0Mon, 13 Jun 2005 20:51:57 +0000\0" + "Date\0Mon, 13 Jun 2005 13:51:57 -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-ia64.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" @@ -29,7 +30,8 @@ " 3 files changed, 118 insertions(+), 2 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,93 @@ static inline void set_current_kprobe(st\n" " \tcurrent_kprobe = p;\n" @@ -80,7 +82,8 @@ "+\t\torig_ret_address = (unsigned long)ri->ret_addr;\n" "+\t\trecycle_rp_inst(ri);\n" "+\n" - "+\t\tif (orig_ret_address !+\t\t ((struct fnptr *)kretprobe_trampoline)->ip)\n" + "+\t\tif (orig_ret_address !=\n" + "+\t\t ((struct fnptr *)kretprobe_trampoline)->ip)\n" "+\t\t\t/*\n" "+\t\t\t * This is the real return address. Any other\n" "+\t\t\t * instances associated with this task are for\n" @@ -146,11 +149,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" @@ -162,7 +167,8 @@ " #define SLOT1_p1_OPCODE_SHIFT\t(37 - (64-46))\n" " #define SLOT2_OPCODE_SHIFT \t(37)\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" @@ -204,4 +210,4 @@ "\n" -- -b22d6ea3661deb72effed4ad34c73c9694f59b5d075b25d193216569d0b47713 +715cd4970903e558e8a1562bf837cdebe81190265496e3361c1a6a3e0a4ced18
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.