diff for duplicates of <47A8E995.1090400@redhat.com> diff --git a/a/1.txt b/N1/1.txt index e06d7f8..2df07c2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,7 +17,8 @@ Thank you 2 files changed, 113 insertions(+), 27 deletions(-) Index: linux-2.6/arch/ia64/kernel/kprobes.c -=================================--- linux-2.6.orig/arch/ia64/kernel/kprobes.c 2008-01-31 00:21:18.000000000 -0500 +=================================================================== +--- linux-2.6.orig/arch/ia64/kernel/kprobes.c 2008-01-31 00:21:18.000000000 -0500 +++ linux-2.6/arch/ia64/kernel/kprobes.c 2008-01-31 00:44:28.000000000 -0500 @@ -78,6 +78,20 @@ { u, u, u }, /* 1F */ @@ -52,7 +53,7 @@ Index: linux-2.6/arch/ia64/kernel/kprobes.c + unsigned long kprobe_inst; + + /* Move to slot 2, if bundle is MLX type and kprobe slot is 1 */ -+ if (slot = 1 && bundle_encoding[template][1] = L) ++ if (slot == 1 && bundle_encoding[template][1] == L) + slot++; + + /* Get Kprobe probe instruction at given slot*/ @@ -88,8 +89,8 @@ Index: linux-2.6/arch/ia64/kernel/kprobes.c + } while ((++slot) < 3); + template &= 0x1e; + if (template >= 0x10 /* including B unit */ || -+ template = 0x04 /* including X unit */ || -+ template = 0x06) /* undefined */ ++ template == 0x04 /* including X unit */ || ++ template == 0x06) /* undefined */ + return 0; + + return 1; @@ -155,7 +156,7 @@ Index: linux-2.6/arch/ia64/kernel/kprobes.c * to original stack address, handle the case where we need to fixup the * relative IP address and/or fixup branch register. @@ -607,7 +696,7 @@ - if (slot = 1 && bundle_encoding[template][1] = L) + if (slot == 1 && bundle_encoding[template][1] == L) slot = 2; - if (p->ainsn.inst_flag) { @@ -176,7 +177,7 @@ Index: linux-2.6/arch/ia64/kernel/kprobes.c - template = bundle.quad0.template; - - /* Move to slot 2, if bundle is MLX type and kprobe slot is 1 */ -- if (slot = 1 && bundle_encoding[template][1] = L) +- if (slot == 1 && bundle_encoding[template][1] == L) - slot++; - - /* Get Kprobe probe instruction at given slot*/ @@ -203,7 +204,7 @@ Index: linux-2.6/arch/ia64/kernel/kprobes.c ss_probe: +#if !defined(CONFIG_PREEMPT) || defined(CONFIG_PM) -+ if (p->ainsn.inst_flag = INST_FLAG_BOOSTABLE && !p->post_handler) { ++ if (p->ainsn.inst_flag == INST_FLAG_BOOSTABLE && !p->post_handler) { + /* Boost up -- we can execute copied instructions directly */ + ia64_psr(regs)->ri = p->ainsn.slot; + regs->cr_iip = (unsigned long)&p->ainsn.insn->bundle & ~0xFULL; @@ -219,7 +220,8 @@ Index: linux-2.6/arch/ia64/kernel/kprobes.c kcb->kprobe_status = KPROBE_HIT_SS; return 1; Index: linux-2.6/include/asm-ia64/kprobes.h -=================================--- linux-2.6.orig/include/asm-ia64/kprobes.h 2008-01-31 00:21:18.000000000 -0500 +=================================================================== +--- linux-2.6.orig/include/asm-ia64/kprobes.h 2008-01-31 00:21:18.000000000 -0500 +++ linux-2.6/include/asm-ia64/kprobes.h 2008-01-31 00:45:07.000000000 -0500 @@ -30,8 +30,12 @@ #include <asm/break.h> diff --git a/a/content_digest b/N1/content_digest index 91034e2..4d9b31b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Masami Hiramatsu <mhiramat@redhat.com>\0" "Subject\0[RFC][PATCH] kprobes: kprobe-booster for ia64\0" - "Date\0Tue, 05 Feb 2008 22:56:21 +0000\0" + "Date\0Tue, 05 Feb 2008 17:56:21 -0500\0" "To\0Ananth N Mavinakayanahalli <ananth@in.ibm.com>" Jim Keniston <jkenisto@us.ibm.com> Shaohua Li <shaohua.li@intel.com> @@ -29,7 +29,8 @@ " 2 files changed, 113 insertions(+), 27 deletions(-)\n" "\n" "Index: linux-2.6/arch/ia64/kernel/kprobes.c\n" - "=================================--- linux-2.6.orig/arch/ia64/kernel/kprobes.c\t2008-01-31 00:21:18.000000000 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/ia64/kernel/kprobes.c\t2008-01-31 00:21:18.000000000 -0500\n" "+++ linux-2.6/arch/ia64/kernel/kprobes.c\t2008-01-31 00:44:28.000000000 -0500\n" "@@ -78,6 +78,20 @@\n" " { u, u, u }, \t\t\t/* 1F */\n" @@ -64,7 +65,7 @@ "+\tunsigned long kprobe_inst;\n" "+\n" "+\t/* Move to slot 2, if bundle is MLX type and kprobe slot is 1 */\n" - "+\tif (slot = 1 && bundle_encoding[template][1] = L)\n" + "+\tif (slot == 1 && bundle_encoding[template][1] == L)\n" "+\t\tslot++;\n" "+\n" "+\t/* Get Kprobe probe instruction at given slot*/\n" @@ -100,8 +101,8 @@ "+\t} while ((++slot) < 3);\n" "+\ttemplate &= 0x1e;\n" "+\tif (template >= 0x10 /* including B unit */ ||\n" - "+\t template = 0x04 /* including X unit */ ||\n" - "+\t template = 0x06) /* undefined */\n" + "+\t template == 0x04 /* including X unit */ ||\n" + "+\t template == 0x06) /* undefined */\n" "+\t\treturn 0;\n" "+\n" "+\treturn 1;\n" @@ -167,7 +168,7 @@ " * to original stack address, handle the case where we need to fixup the\n" " * relative IP address and/or fixup branch register.\n" "@@ -607,7 +696,7 @@\n" - " \tif (slot = 1 && bundle_encoding[template][1] = L)\n" + " \tif (slot == 1 && bundle_encoding[template][1] == L)\n" " \t\tslot = 2;\n" "\n" "-\tif (p->ainsn.inst_flag) {\n" @@ -188,7 +189,7 @@ "-\ttemplate = bundle.quad0.template;\n" "-\n" "-\t/* Move to slot 2, if bundle is MLX type and kprobe slot is 1 */\n" - "-\tif (slot = 1 && bundle_encoding[template][1] = L)\n" + "-\tif (slot == 1 && bundle_encoding[template][1] == L)\n" "-\t\tslot++;\n" "-\n" "-\t/* Get Kprobe probe instruction at given slot*/\n" @@ -215,7 +216,7 @@ "\n" " ss_probe:\n" "+#if !defined(CONFIG_PREEMPT) || defined(CONFIG_PM)\n" - "+\tif (p->ainsn.inst_flag = INST_FLAG_BOOSTABLE && !p->post_handler) {\n" + "+\tif (p->ainsn.inst_flag == INST_FLAG_BOOSTABLE && !p->post_handler) {\n" "+\t\t/* Boost up -- we can execute copied instructions directly */\n" "+\t\tia64_psr(regs)->ri = p->ainsn.slot;\n" "+\t\tregs->cr_iip = (unsigned long)&p->ainsn.insn->bundle & ~0xFULL;\n" @@ -231,7 +232,8 @@ " \tkcb->kprobe_status = KPROBE_HIT_SS;\n" " \treturn 1;\n" "Index: linux-2.6/include/asm-ia64/kprobes.h\n" - "=================================--- linux-2.6.orig/include/asm-ia64/kprobes.h\t2008-01-31 00:21:18.000000000 -0500\n" + "===================================================================\n" + "--- linux-2.6.orig/include/asm-ia64/kprobes.h\t2008-01-31 00:21:18.000000000 -0500\n" "+++ linux-2.6/include/asm-ia64/kprobes.h\t2008-01-31 00:45:07.000000000 -0500\n" "@@ -30,8 +30,12 @@\n" " #include <asm/break.h>\n" @@ -264,4 +266,4 @@ "\n" e-mail: mhiramat@redhat.com -a090d8137188d85935d47dd62da3259bd9da16be6dc3070f0c658d63bf6e577b +26c2fab342a25c71ff779502de37a9a393576930cd441af8c7f2fc21a7b1ff73
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.