diff for duplicates of <47D166E7.2050803@redhat.com> diff --git a/a/1.txt b/N1/1.txt index e3d75a3..11bb143 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,8 @@ Shaohua, could you review it? 2 files changed, 113 insertions(+), 27 deletions(-) Index: 2.6.25-rc3-mm1/arch/ia64/kernel/kprobes.c -=================================--- 2.6.25-rc3-mm1.orig/arch/ia64/kernel/kprobes.c 2008-03-04 16:22:29.000000000 -0500 +=================================================================== +--- 2.6.25-rc3-mm1.orig/arch/ia64/kernel/kprobes.c 2008-03-04 16:22:29.000000000 -0500 +++ 2.6.25-rc3-mm1/arch/ia64/kernel/kprobes.c 2008-03-04 16:22:30.000000000 -0500 @@ -78,6 +78,20 @@ static enum instruction_type bundle_enco { u, u, u }, /* 1F */ @@ -59,7 +60,7 @@ Index: 2.6.25-rc3-mm1/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*/ @@ -95,8 +96,8 @@ Index: 2.6.25-rc3-mm1/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; @@ -162,7 +163,7 @@ Index: 2.6.25-rc3-mm1/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 @@ static void __kprobes resume_execution(s - if (slot = 1 && bundle_encoding[template][1] = L) + if (slot == 1 && bundle_encoding[template][1] == L) slot = 2; - if (p->ainsn.inst_flag) { @@ -183,7 +184,7 @@ Index: 2.6.25-rc3-mm1/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*/ @@ -210,7 +211,7 @@ Index: 2.6.25-rc3-mm1/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; @@ -226,7 +227,8 @@ Index: 2.6.25-rc3-mm1/arch/ia64/kernel/kprobes.c kcb->kprobe_status = KPROBE_HIT_SS; return 1; Index: 2.6.25-rc3-mm1/include/asm-ia64/kprobes.h -=================================--- 2.6.25-rc3-mm1.orig/include/asm-ia64/kprobes.h 2008-03-04 16:22:29.000000000 -0500 +=================================================================== +--- 2.6.25-rc3-mm1.orig/include/asm-ia64/kprobes.h 2008-03-04 16:22:29.000000000 -0500 +++ 2.6.25-rc3-mm1/include/asm-ia64/kprobes.h 2008-03-04 16:22:30.000000000 -0500 @@ -30,8 +30,12 @@ #include <asm/break.h> diff --git a/a/content_digest b/N1/content_digest index f25d66f..e04e71f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Masami Hiramatsu <mhiramat@redhat.com>\0" "Subject\0[PATCH -mm] kprobes: kprobe-booster for ia64\0" - "Date\0Fri, 07 Mar 2008 16:01:43 +0000\0" + "Date\0Fri, 07 Mar 2008 11:01:43 -0500\0" "To\0Shaohua Li <shaohua.li@intel.com>" " Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" @@ -38,7 +38,8 @@ " 2 files changed, 113 insertions(+), 27 deletions(-)\n" "\n" "Index: 2.6.25-rc3-mm1/arch/ia64/kernel/kprobes.c\n" - "=================================--- 2.6.25-rc3-mm1.orig/arch/ia64/kernel/kprobes.c\t2008-03-04 16:22:29.000000000 -0500\n" + "===================================================================\n" + "--- 2.6.25-rc3-mm1.orig/arch/ia64/kernel/kprobes.c\t2008-03-04 16:22:29.000000000 -0500\n" "+++ 2.6.25-rc3-mm1/arch/ia64/kernel/kprobes.c\t2008-03-04 16:22:30.000000000 -0500\n" "@@ -78,6 +78,20 @@ static enum instruction_type bundle_enco\n" " { u, u, u }, \t\t\t/* 1F */\n" @@ -73,7 +74,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" @@ -109,8 +110,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" @@ -176,7 +177,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 @@ static void __kprobes resume_execution(s\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" @@ -197,7 +198,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" @@ -224,7 +225,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" @@ -240,7 +241,8 @@ " \tkcb->kprobe_status = KPROBE_HIT_SS;\n" " \treturn 1;\n" "Index: 2.6.25-rc3-mm1/include/asm-ia64/kprobes.h\n" - "=================================--- 2.6.25-rc3-mm1.orig/include/asm-ia64/kprobes.h\t2008-03-04 16:22:29.000000000 -0500\n" + "===================================================================\n" + "--- 2.6.25-rc3-mm1.orig/include/asm-ia64/kprobes.h\t2008-03-04 16:22:29.000000000 -0500\n" "+++ 2.6.25-rc3-mm1/include/asm-ia64/kprobes.h\t2008-03-04 16:22:30.000000000 -0500\n" "@@ -30,8 +30,12 @@\n" " #include <asm/break.h>\n" @@ -273,4 +275,4 @@ "\n" e-mail: mhiramat@redhat.com -6cc4de043aac6abee9a21405a1371d870fad7e67d7f62fbcccfbd05727653987 +3172ded8d85c04c7f6284ea48e8b62686dd1dea9b67b08d548515f1f3f17569c
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.