diff for duplicates of <20050606174059.177392000@csdlinux-2.jf.intel.com> diff --git a/a/1.txt b/N1/1.txt index 4d18eb8..2bd83fe 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,11 +8,13 @@ user tries to insert kprobes on the above kind of instruction. Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> -================================= arch/ia64/kernel/kprobes.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ +=================================================================== + arch/ia64/kernel/kprobes.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+) Index: linux-2.6.12-rc5/arch/ia64/kernel/kprobes.c -=================================--- linux-2.6.12-rc5.orig/arch/ia64/kernel/kprobes.c +=================================================================== +--- linux-2.6.12-rc5.orig/arch/ia64/kernel/kprobes.c +++ linux-2.6.12-rc5/arch/ia64/kernel/kprobes.c @@ -98,6 +98,48 @@ static inline void set_current_kprobe(st current_kprobe = p; @@ -29,14 +31,14 @@ Index: linux-2.6.12-rc5/arch/ia64/kernel/kprobes.c +{ + unsigned long addr = (unsigned long)p->addr; + -+ if (bundle_encoding[template][slot] = I) { ++ if (bundle_encoding[template][slot] == I) { + switch (major_opcode) { + case 0x0: //I_UNIT_MISC_OPCODE: + /* + * Check for Integer speculation instruction + * - Bit 33-35 to be equal to 0x1 + */ -+ if (((kprobe_inst >> 33) & 0x7) = 1) { ++ if (((kprobe_inst >> 33) & 0x7) == 1) { + printk(KERN_WARNING + "Kprobes on speculation inst at <0x%lx> not supported\n", + addr); @@ -47,7 +49,7 @@ Index: linux-2.6.12-rc5/arch/ia64/kernel/kprobes.c + * IP relative mov instruction + * - Bit 27-35 to be equal to 0x30 + */ -+ if (((kprobe_inst >> 27) & 0x1FF) = 0x30) { ++ if (((kprobe_inst >> 27) & 0x1FF) == 0x30) { + printk(KERN_WARNING + "Kprobes on \"mov r1=ip\" at <0x%lx> not supported\n", + addr); diff --git a/a/content_digest b/N1/content_digest index 1f70a1e..4798a4b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020050606173652.059047000@csdlinux-2.jf.intel.com\0" "From\0Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>\0" "Subject\0[patch 3/3] Kprobes IA64 safe register kprobe\0" - "Date\0Mon, 06 Jun 2005 17:36:55 +0000\0" + "Date\0Mon, 06 Jun 2005 10:36:55 -0700\0" "To\0akpm@osdl.org\0" "Cc\0linux-kernel@vger.kernel.org" linux-ia64@vger.kernel.org @@ -11,6 +11,7 @@ alen.brunelle@hp.com " anil.s.keshavamurthy@intel.com\0" "\00:1\0" + "fn\0kprobes-ia64-safe-register-kprobe.patch\0" "b\0" "The current kprobes does not yet handle register\n" "kprobes on some of the following kind of instruction\n" @@ -22,11 +23,13 @@ "instruction.\n" "\n" "Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>\n" - "================================= arch/ia64/kernel/kprobes.c | 45 +++++++++++++++++++++++++++++++++++++++++++++\n" + "===================================================================\n" + " arch/ia64/kernel/kprobes.c | 45 +++++++++++++++++++++++++++++++++++++++++++++\n" " 1 files changed, 45 insertions(+)\n" "\n" "Index: linux-2.6.12-rc5/arch/ia64/kernel/kprobes.c\n" - "=================================--- linux-2.6.12-rc5.orig/arch/ia64/kernel/kprobes.c\n" + "===================================================================\n" + "--- linux-2.6.12-rc5.orig/arch/ia64/kernel/kprobes.c\n" "+++ linux-2.6.12-rc5/arch/ia64/kernel/kprobes.c\n" "@@ -98,6 +98,48 @@ static inline void set_current_kprobe(st\n" " \tcurrent_kprobe = p;\n" @@ -43,14 +46,14 @@ "+{\n" "+\tunsigned long addr = (unsigned long)p->addr;\n" "+\t\n" - "+\tif (bundle_encoding[template][slot] = I) {\n" + "+\tif (bundle_encoding[template][slot] == I) {\n" "+\t\tswitch (major_opcode) {\n" "+\t\t\tcase 0x0: //I_UNIT_MISC_OPCODE:\n" "+\t\t\t/*\n" "+\t\t\t * Check for Integer speculation instruction\n" "+\t\t\t * - Bit 33-35 to be equal to 0x1\n" "+\t\t\t */\n" - "+\t\t\tif (((kprobe_inst >> 33) & 0x7) = 1) {\n" + "+\t\t\tif (((kprobe_inst >> 33) & 0x7) == 1) {\n" "+\t\t\t\tprintk(KERN_WARNING \n" "+\t\t\t\t\t\"Kprobes on speculation inst at <0x%lx> not supported\\n\",\n" "+\t\t\t\t\taddr);\n" @@ -61,7 +64,7 @@ "+\t\t\t * IP relative mov instruction\n" "+\t\t\t * - Bit 27-35 to be equal to 0x30\n" "+\t\t\t */\n" - "+\t\t\tif (((kprobe_inst >> 27) & 0x1FF) = 0x30) {\n" + "+\t\t\tif (((kprobe_inst >> 27) & 0x1FF) == 0x30) {\n" "+\t\t\t\tprintk(KERN_WARNING \n" "+\t\t\t\t\t\"Kprobes on \\\"mov r1=ip\\\" at <0x%lx> not supported\\n\",\n" "+\t\t\t\t\taddr);\n" @@ -90,4 +93,4 @@ "\n" -- -da9a41106536eaed1ee8d6836dc596689dd52fab8bd9426af99bebcad6bdff32 +1aa78ea5cad11ed603460f232f42875e59b1f30d64d1ea8ad24520530da9fff5
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.